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

Unified Diff: chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc

Issue 385533002: [Mac] Make --apps-keep-chrome-alive on by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable on tests. Created 6 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/about_flags.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc
diff --git a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc
index 1d9fa4fb59667a78dff2dd16216aaae1ff56b55b..ab37a40274b450f52b9a9379501a99890ee8febb 100644
--- a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc
+++ b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc
@@ -104,10 +104,10 @@ std::string QuitWithAppsController::id() const {
bool QuitWithAppsController::ShouldQuit() {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
+ // Quit immediately if this is a test.
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType) &&
+ !CommandLine::ForCurrentProcess()->HasSwitch(
switches::kAppsKeepChromeAlive)) {
tapted 2014/07/14 23:23:29 If we keep the switch, I think we should rename it
jackhou1 2014/07/15 05:21:37 Done.
- g_browser_process->local_state()->ClearPref(
- prefs::kNotifyWhenAppsKeepChromeAlive);
return true;
}
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698