diff options
Diffstat (limited to 'chrome/browser/app_controller_mac.mm')
| -rw-r--r-- | chrome/browser/app_controller_mac.mm | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 2464c0d..c8a6a16 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -52,7 +52,6 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/chrome_pages.h" #import "chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.h" -#include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" #import "chrome/browser/ui/cocoa/browser_window_cocoa.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" @@ -372,12 +371,6 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver { ![self shouldQuitWithInProgressDownloads]) return NO; - // Check for active apps, and prompt the user if they really want to quit - // (and also quit the apps). - if (!browser_shutdown::IsTryingToQuit() && - quitWithAppsController_.get() && !quitWithAppsController_->ShouldQuit()) - return NO; - // TODO(viettrungluu): Remove Apple Event handlers here? (It's safe to leave // them in, but I'm not sure about UX; we'd also want to disable other things // though.) http://crbug.com/40861 @@ -702,10 +695,6 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver { // main menu item titles are not yet initialized in awakeFromNib. [self initAppShimMenuController]; - // If enabled, keep Chrome alive when apps are open instead of quitting all - // apps. - quitWithAppsController_ = new QuitWithAppsController(); - // Build up the encoding menu, the order of the items differs based on the // current locale (see http://crbug.com/7647 for details). // We need a valid g_browser_process to get the profile which is why we can't |