chrome/browser/prefs/browser_prefs.cc - Issue 220373003: Prevent Chrome from quitting when apps are open. (Mac)

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/prefs/browser_prefs.cc

Issue 220373003: Prevent Chrome from quitting when apps are open. (Mac) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments 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:

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index fa6d8ad4b1227148fced7a3222b24b489b481885..2289e6adc777154307a3f77b43b2adc8203f3129 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -174,6 +174,7 @@

#endif

#if defined(OS_MACOSX)

+#include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h"

#include "chrome/browser/ui/cocoa/confirm_quit.h"

#include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h"

#endif

@@ -321,6 +322,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

#if defined(OS_MACOSX)

confirm_quit::RegisterLocalState(registry);

+ QuitWithAppsController::RegisterPrefs(registry);

#endif

#if defined(OS_WIN)