Index: chrome/browser/app_controller_mac.mm |
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm |
index 34147c631f762cd7464502ce67f7c09f8574081e..214a6d59791ef4d5c8beae59537e234ed3177636 100644 |
--- a/chrome/browser/app_controller_mac.mm |
+++ b/chrome/browser/app_controller_mac.mm |
@@ -382,27 +382,12 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver { |
} |
- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication*)app { |
- using apps::ShellWindowRegistry; |
- |
// If there are no windows, quit immediately. |
if (chrome::BrowserIterator().done() && |
- !ShellWindowRegistry::IsShellWindowRegisteredInAnyProfile(0)) { |
+ !apps::ShellWindowRegistry::IsShellWindowRegisteredInAnyProfile(0)) { |
return NSTerminateNow; |
} |
- // Check if this is a keyboard initiated quit on an app window. If so, quit |
- // the app. This could cause the app to trigger another terminate, but that |
- // will be caught by the no windows condition above. |
- if ([[app currentEvent] type] == NSKeyDown) { |
- apps::ShellWindow* shellWindow = |
- ShellWindowRegistry::GetShellWindowForNativeWindowAnyProfile( |
- [app keyWindow]); |
- if (shellWindow) { |
- apps::ExtensionAppShimHandler::QuitAppForWindow(shellWindow); |
- return NSTerminateCancel; |
- } |
- } |
- |
// Check if the preference is turned on. |
const PrefService* prefs = g_browser_process->local_state(); |
if (!prefs->GetBoolean(prefs::kConfirmToQuitEnabled)) { |