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

Unified Diff: chrome/browser/browser_shutdown.cc

Issue 210673002: Revert of Delete "shutdown without closing browsers" path (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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/chrome_browser_main_extra_parts_x11.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 37b1ba3787c76068f67c8308c8583636d0d9e392..7ebee0d277ff076f62cfa34352684187522f5fbb 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -18,7 +18,9 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/threading/thread.h"
+#include "base/threading/thread_restrictions.h"
#include "base/time/time.h"
+#include "build/build_config.h"
#include "chrome/browser/about_flags.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/first_run/upgrade_util.h"
@@ -34,6 +36,8 @@
#include "chrome/common/switch_utils.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/render_view_host.h"
+#include "ui/base/resource/resource_bundle.h"
#if defined(OS_WIN)
#include "chrome/browser/browser_util_win.h"
@@ -57,6 +61,9 @@
// Whether the browser is trying to quit (e.g., Quit chosen from menu).
bool g_trying_to_quit = false;
+
+// Whether the browser should quit without closing browsers.
+bool g_shutting_down_without_closing_browsers = false;
#if defined(OS_WIN)
upgrade_util::RelaunchMode g_relaunch_mode =
@@ -339,4 +346,12 @@
return g_trying_to_quit;
}
+bool ShuttingDownWithoutClosingBrowsers() {
+ return g_shutting_down_without_closing_browsers;
+}
+
+void SetShuttingDownWithoutClosingBrowsers(bool without_close) {
+ g_shutting_down_without_closing_browsers = without_close;
+}
+
} // namespace browser_shutdown
« no previous file with comments | « chrome/browser/browser_shutdown.h ('k') | chrome/browser/chrome_browser_main_extra_parts_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698