diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-17 15:31:36 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-28 14:24:41 +0100 |
| commit | c3ab932f8b2f3a52383ce0db3ff67c925b138bde (patch) | |
| tree | 48a9899f1ac5a4f29b6814c2e6c6717300cad137 /src/core/net/cookie_monster_delegate_qt.cpp | |
| parent | 26b4267a3b00ebedb560169d09f974cd87a6a370 (diff) | |
Adaptations for Chromium 79
Fixes: QTBUG-80737
Fixes: QTBUG-81556
Fixes: QTBUG-81614
Change-Id: Ie6a69cdbf46d0508bff226f1b8fed28a618e1949
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/net/cookie_monster_delegate_qt.cpp')
| -rw-r--r-- | src/core/net/cookie_monster_delegate_qt.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/core/net/cookie_monster_delegate_qt.cpp b/src/core/net/cookie_monster_delegate_qt.cpp index 3e8cced67..cf114406b 100644 --- a/src/core/net/cookie_monster_delegate_qt.cpp +++ b/src/core/net/cookie_monster_delegate_qt.cpp @@ -61,10 +61,9 @@ public: ~CookieChangeListener() override = default; // network::mojom::CookieChangeListener: - void OnCookieChange(const net::CanonicalCookie &canonical_cookie, - network::mojom::CookieChangeCause cause) override + void OnCookieChange(const net::CookieChangeInfo &change) override { - m_delegate->OnCookieChanged(canonical_cookie, net::CookieChangeCause(cause)); + m_delegate->OnCookieChanged(change); } private: @@ -93,9 +92,9 @@ CookieMonsterDelegateQt::~CookieMonsterDelegateQt() void CookieMonsterDelegateQt::AddStore(net::CookieStore *store) { std::unique_ptr<net::CookieChangeSubscription> sub = store->GetChangeDispatcher().AddCallbackForAllChanges( - base::Bind(&CookieMonsterDelegateQt::OnCookieChanged, - // this object's destruction will deregister the subscription. - base::Unretained(this))); + base::BindRepeating(&CookieMonsterDelegateQt::OnCookieChanged, + // this object's destruction will deregister the subscription. + base::Unretained(this))); m_subscriptions.push_back(std::move(sub)); } @@ -217,11 +216,11 @@ bool CookieMonsterDelegateQt::canGetCookies(const QUrl &firstPartyUrl, const QUr return m_client->d_func()->canAccessCookies(firstPartyUrl, url); } -void CookieMonsterDelegateQt::OnCookieChanged(const net::CanonicalCookie &cookie, net::CookieChangeCause cause) +void CookieMonsterDelegateQt::OnCookieChanged(const net::CookieChangeInfo &change) { if (!m_client) return; - m_client->d_func()->onCookieChanged(toQt(cookie), cause != net::CookieChangeCause::INSERTED); + m_client->d_func()->onCookieChanged(toQt(change.cookie), change.cause != net::CookieChangeCause::INSERTED); } void CookieMonsterDelegateQt::GetAllCookiesCallbackOnUIThread(qint64 callbackId, const std::vector<net::CanonicalCookie> &cookies) |