diff options
| author | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 14:16:02 +0000 |
|---|---|---|
| committer | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 14:16:02 +0000 |
| commit | b8b600842f1999c19eba512bbb8b022f74490187 (patch) | |
| tree | b945b5ce3e7dd45a8e6db7a2482c0cea52308e66 /chrome/browser/profiles | |
| parent | 7dd20e4f00adb47225ad9df20b799abcf215a090 (diff) | |
| download | chromium_src-b8b600842f1999c19eba512bbb8b022f74490187.zip chromium_src-b8b600842f1999c19eba512bbb8b022f74490187.tar.gz chromium_src-b8b600842f1999c19eba512bbb8b022f74490187.tar.bz2 | |
Fixes for the kWasRestarted pref.
Reset the kWasRestarted pref upon successful restart. Set it only when restarting. Write
the persistent preferences after setting it.
The preference was introduced in http://codereview.chromium.org/8745015.
BUG=106948
TEST=see bug
Review URL: http://codereview.chromium.org/8937001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114213 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles')
| -rw-r--r-- | chrome/browser/profiles/profile_impl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 5088f3c..6574cd7 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -78,6 +78,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" @@ -378,7 +379,7 @@ void ProfileImpl::DoFinalInit() { (!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. |