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/app_controller_mac.h | |
| 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/app_controller_mac.h')
| -rw-r--r-- | chrome/browser/app_controller_mac.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/browser/app_controller_mac.h b/chrome/browser/app_controller_mac.h index f148c13..efb0783 100644 --- a/chrome/browser/app_controller_mac.h +++ b/chrome/browser/app_controller_mac.h @@ -25,8 +25,6 @@ class GURL; class HistoryMenuBridge; class Profile; @class ProfileMenuController; -class QuitWithAppsController; - namespace ui { class WorkAreaWatcherObserver; } @@ -89,9 +87,6 @@ class WorkAreaWatcherObserver; scoped_ptr<PrefChangeRegistrar> profilePrefRegistrar_; PrefChangeRegistrar localPrefRegistrar_; - - // Displays a notification when quitting while apps are running. - scoped_refptr<QuitWithAppsController> quitWithAppsController_; } @property(readonly, nonatomic) BOOL startupComplete; |