Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(252)

Unified Diff: ios/net/cookies/cookie_store_ios.mm

Issue 2349823003: Pass a RemovalCause to CookieChangedCallback (Closed)
Patch Set: Fix compilation errors Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/net/cookies/cookie_store_ios.mm
diff --git a/ios/net/cookies/cookie_store_ios.mm b/ios/net/cookies/cookie_store_ios.mm
index fbee5323576fc5b4c83815dfde48161c5281bf2b..d16fcf09c6378da71c699c490ba4658e3ee0091d 100644
--- a/ios/net/cookies/cookie_store_ios.mm
+++ b/ios/net/cookies/cookie_store_ios.mm
@@ -969,8 +969,10 @@ void CookieStoreIOS::OnSystemCookiesChanged() {
std::vector<net::CanonicalCookie> added_cookies;
if (UpdateCacheForCookieFromSystem(key.first, key.second, &removed_cookies,
&added_cookies)) {
- RunCallbacksForCookies(key.first, key.second, removed_cookies, true);
- RunCallbacksForCookies(key.first, key.second, added_cookies, false);
+ RunCallbacksForCookies(key.first, key.second, removed_cookies, true,
+ net::CookieStore::RemovalCause::UNKNOWN);
+ RunCallbacksForCookies(key.first, key.second, added_cookies, false,
+ net::CookieStore::RemovalCause::UNKNOWN);
}
}
@@ -1022,7 +1024,8 @@ void CookieStoreIOS::RunCallbacksForCookies(
const GURL& url,
const std::string& name,
const std::vector<net::CanonicalCookie>& cookies,
- bool removed) {
+ bool removed,
+ net::CookieStore::RemovalCause cause) {
DCHECK(thread_checker_.CalledOnValidThread());
if (cookies.empty())
return;
@@ -1031,7 +1034,7 @@ void CookieStoreIOS::RunCallbacksForCookies(
CookieChangedCallbackList* callbacks = hook_map_[key];
for (const auto& cookie : cookies) {
DCHECK_EQ(name, cookie.Name());
- callbacks->Notify(cookie, removed);
+ callbacks->Notify(cookie, removed, cause);
}
}
@@ -1064,8 +1067,10 @@ void CookieStoreIOS::GotCookieListFor(const std::pair<GURL, std::string> key,
std::vector<net::CanonicalCookie> added_cookies;
if (cookie_cache_->Update(key.first, key.second, filtered, &removed_cookies,
&added_cookies)) {
- RunCallbacksForCookies(key.first, key.second, removed_cookies, true);
- RunCallbacksForCookies(key.first, key.second, added_cookies, false);
+ RunCallbacksForCookies(key.first, key.second, removed_cookies, true,
+ net::CookieStore::RemovalCause::UNKNOWN);
+ RunCallbacksForCookies(key.first, key.second, added_cookies, false,
+ net::CookieStore::RemovalCause::UNKNOWN);
}
}

Powered by Google App Engine
This is Rietveld 408576698