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

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

Issue 8907025: Merge 114213 - Fixes for the kWasRestarted pref. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/963/src/
Patch Set: Created 9 years 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
« no previous file with comments | « chrome/browser/chrome_browser_main_posix.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_impl.cc
===================================================================
--- chrome/browser/profiles/profile_impl.cc (revision 114325)
+++ chrome/browser/profiles/profile_impl.cc (working copy)
@@ -77,6 +77,7 @@
#include "chrome/browser/sync/profile_sync_service.h"
#include "chrome/browser/tabs/pinned_tab_service_factory.h"
#include "chrome/browser/transport_security_persister.h"
+#include "chrome/browser/ui/browser_init.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/find_bar/find_bar_state.h"
#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
@@ -374,7 +375,7 @@
(!DidLastSessionExitCleanly() ||
CommandLine::ForCurrentProcess()->HasSwitch(
switches::kRestoreLastSession) ||
- local_state->GetBoolean(prefs::kWasRestarted));
+ BrowserInit::WasRestarted());
// Make sure we initialize the ProfileIOData after everything else has been
// initialized that we might be reading from the IO thread.
« no previous file with comments | « chrome/browser/chrome_browser_main_posix.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698