chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.cc - Issue 385533002: [Mac] Make --apps-keep-chrome-alive on by default.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Change switch name 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:

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..5560387fefc109a8c40616e789d7333220bec697 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(

- switches::kAppsKeepChromeAlive)) {

- g_browser_process->local_state()->ClearPref(

- prefs::kNotifyWhenAppsKeepChromeAlive);

+ // Quit immediately if this is a test.

+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType) &&

+ !CommandLine::ForCurrentProcess()->HasSwitch(

+ switches::kAppsKeepChromeAliveInTests)) {

return true;

}