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

Unified Diff: chrome/browser/browser_shutdown.cc

Issue 2866034: Refactor shutdown code to allow win/linux to run after last browser closes. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Uploaded patch that resolves merge issue Created 10 years, 5 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
« no previous file with comments | « chrome/browser/browser_shutdown.h ('k') | chrome/browser/browser_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_shutdown.cc
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index dd541ef38cdcdfe064ee9da3531a5646065c17a8..7e5fdedcf60823796a8b7d754de53bd156e68331 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -43,10 +43,8 @@ using base::TimeDelta;
namespace browser_shutdown {
-#if defined(OS_MACOSX)
// Whether the browser is trying to quit (e.g., Quit chosen from menu).
bool g_trying_to_quit = false;
-#endif // OS_MACOSX
Time shutdown_started_;
ShutdownType shutdown_type_ = NOT_VALID;
@@ -262,7 +260,6 @@ void ReadLastShutdownInfo() {
&ReadLastShutdownFile, type, num_procs, num_procs_slow));
}
-#if defined(OS_MACOSX)
void SetTryingToQuit(bool quitting) {
g_trying_to_quit = quitting;
}
@@ -270,6 +267,5 @@ void SetTryingToQuit(bool quitting) {
bool IsTryingToQuit() {
return g_trying_to_quit;
}
-#endif
} // namespace browser_shutdown
« no previous file with comments | « chrome/browser/browser_shutdown.h ('k') | chrome/browser/browser_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698