diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-24 12:05:50 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-24 12:05:50 +0000 |
| commit | b1d98795e970e62a6760c554391effd3d7300775 (patch) | |
| tree | d5bc0847a07ea72e8a19f940e0212b685f1ba497 /chrome/browser/prefs/browser_prefs.cc | |
| parent | 54f6d310744e333ce6b9efec7787896952d405d6 (diff) | |
| download | chromium_src-b1d98795e970e62a6760c554391effd3d7300775.zip chromium_src-b1d98795e970e62a6760c554391effd3d7300775.tar.gz chromium_src-b1d98795e970e62a6760c554391effd3d7300775.tar.bz2 | |
Revert 265889 "Prevent Chrome from quitting when apps are open. ..."
QuitWithAppsControllerInteractiveTest.QuitBehavior fails with a use-after-free
under ASan on Mac.
> Prevent Chrome from quitting when apps are open. (Mac)
>
> This is added behind --apps-keep-chrome-alive.
>
> When Chrome is quit, a notification is shown to let the user know that
> Chrome will continue running.
>
> The browser session should be shut down like on Windows, but that is
> not yet implemented. Similarly, quitting all the apps should quit
> Chrome. These will be added in followup CLs.
>
> BUG=333429
>
> Review URL: https://codereview.chromium.org/220373003
TBR=jackhou@chromium.org
Review URL: https://codereview.chromium.org/256503003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/browser_prefs.cc')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 4053fca..fd2bd10 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -172,7 +172,6 @@ #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 @@ -316,7 +315,6 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(OS_MACOSX) confirm_quit::RegisterLocalState(registry); - QuitWithAppsController::RegisterPrefs(registry); #endif #if defined(OS_WIN) |