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

Unified Diff: chrome/browser/ui/browser_init.cc

Issue 8916006: Revert 114441 - Follow-up changes to http://codereview.chromium.org/8937001 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/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/ui/browser_init.h ('k') | chrome/browser/ui/browser_init_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_init.cc
===================================================================
--- chrome/browser/ui/browser_init.cc (revision 114451)
+++ chrome/browser/ui/browser_init.cc (working copy)
@@ -498,6 +498,9 @@
// BrowserInit ----------------------------------------------------------------
+bool BrowserInit::was_restarted_ = false;
+bool BrowserInit::was_restarted_read_ = false;
+
BrowserInit::BrowserInit() {}
BrowserInit::~BrowserInit() {}
@@ -586,20 +589,14 @@
// static
bool BrowserInit::WasRestarted() {
- // Stores the value of the preference kWasRestarted had when it was read.
- static bool was_restarted = false;
-
- // True if we have already read and reset the preference kWasRestarted.
- static bool was_restarted_read = false;
-
- if (!was_restarted_read) {
+ if (!was_restarted_read_) {
PrefService* pref_service = g_browser_process->local_state();
- was_restarted = pref_service->GetBoolean(prefs::kWasRestarted);
+ was_restarted_ = pref_service->GetBoolean(prefs::kWasRestarted);
pref_service->SetBoolean(prefs::kWasRestarted, false);
pref_service->ScheduleSavePersistentPrefs();
- was_restarted_read = true;
+ was_restarted_read_ = true;
}
- return was_restarted;
+ return was_restarted_;
}
// BrowserInit::LaunchWithProfile::Tab ----------------------------------------
« no previous file with comments | « chrome/browser/ui/browser_init.h ('k') | chrome/browser/ui/browser_init_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698