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

Side by Side Diff: chrome/browser/browser_shutdown.cc

Issue 3146007: Fix for issue 51693, which was a regression from integrating the open source... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/extensions/extension_rlz_module.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/browser_shutdown.h" 5 #include "chrome/browser/browser_shutdown.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "app/resource_bundle.h" 9 #include "app/resource_bundle.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 // Check local state for the restart flag so we can restart the session below. 132 // Check local state for the restart flag so we can restart the session below.
133 bool restart_last_session = false; 133 bool restart_last_session = false;
134 if (prefs->HasPrefPath(prefs::kRestartLastSessionOnShutdown)) { 134 if (prefs->HasPrefPath(prefs::kRestartLastSessionOnShutdown)) {
135 restart_last_session = 135 restart_last_session =
136 prefs->GetBoolean(prefs::kRestartLastSessionOnShutdown); 136 prefs->GetBoolean(prefs::kRestartLastSessionOnShutdown);
137 prefs->ClearPref(prefs::kRestartLastSessionOnShutdown); 137 prefs->ClearPref(prefs::kRestartLastSessionOnShutdown);
138 } 138 }
139 139
140 prefs->SavePersistentPrefs(); 140 prefs->SavePersistentPrefs();
141 141
142 #if defined(OS_WIN) 142 #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
143 // Cleanup any statics created by RLZ. Must be done before NotificationService 143 // Cleanup any statics created by RLZ. Must be done before NotificationService
144 // is destroyed. 144 // is destroyed.
145 RLZTracker::CleanupRlz(); 145 RLZTracker::CleanupRlz();
146 #endif 146 #endif
147 147
148 // The jank'o'meter requires that the browser process has been destroyed 148 // The jank'o'meter requires that the browser process has been destroyed
149 // before calling UninstallJankometer(). 149 // before calling UninstallJankometer().
150 delete g_browser_process; 150 delete g_browser_process;
151 g_browser_process = NULL; 151 g_browser_process = NULL;
152 152
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 283
284 void SetTryingToQuit(bool quitting) { 284 void SetTryingToQuit(bool quitting) {
285 g_trying_to_quit = quitting; 285 g_trying_to_quit = quitting;
286 } 286 }
287 287
288 bool IsTryingToQuit() { 288 bool IsTryingToQuit() {
289 return g_trying_to_quit; 289 return g_trying_to_quit;
290 } 290 }
291 291
292 } // namespace browser_shutdown 292 } // namespace browser_shutdown
OLDNEW
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/extensions/extension_rlz_module.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698