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

Unified Diff: chrome/browser/profiles/profile_impl.cc

Issue 110883017: Add CookieStoreConfig to unify API for in-memory and persistent CookieStore Creation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge ToT again. Created 6 years, 11 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: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 5a1529f2300919984d94c998a468509d2e8b21e2..3ef5fb685edeeb949a87aa50a81549b49e277346 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -613,9 +613,12 @@ void ProfileImpl::DoFinalInit() {
StartupBrowserCreator::GetSessionStartupPref(
*CommandLine::ForCurrentProcess(), this).type;
#endif
- bool restore_old_session_cookies =
- (GetLastSessionExitType() == Profile::EXIT_CRASHED ||
- startup_pref_type == SessionStartupPref::LAST);
+ content::CookieStoreConfig::SessionCookieMode session_cookie_mode =
+ content::CookieStoreConfig::PERSISTANT_SESSION_COOKIES;
+ if (GetLastSessionExitType() == Profile::EXIT_CRASHED ||
+ startup_pref_type == SessionStartupPref::LAST) {
+ session_cookie_mode = content::CookieStoreConfig::RESTORED_SESSION_COOKIES;
+ }
InitHostZoomMap();
@@ -626,7 +629,7 @@ void ProfileImpl::DoFinalInit() {
cache_max_size, media_cache_path, media_cache_max_size,
extensions_cookie_path, GetPath(), infinite_cache_path,
predictor_,
- restore_old_session_cookies,
+ session_cookie_mode,
GetSpecialStoragePolicy());
#if defined(ENABLE_PLUGINS)
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_io_data.cc ('k') | chrome/browser/profiles/profile_impl_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698