summaryrefslogtreecommitdiffstats
path: root/apps/DEPS
diff options
context:
space:
mode:
authorjackhou@chromium.org <jackhou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-31 12:14:40 +0000
committerjackhou@chromium.org <jackhou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-31 12:14:40 +0000
commit90a4b9d59dbf2665c1c849e0b12e422e2d9eb426 (patch)
treed5d56721b301d3ab353a831f9dcd25c8d7a9d1a9 /apps/DEPS
parent5942c9b902ce06562084cd1c598639a9d1e745fc (diff)
downloadchromium_src-90a4b9d59dbf2665c1c849e0b12e422e2d9eb426.zip
chromium_src-90a4b9d59dbf2665c1c849e0b12e422e2d9eb426.tar.gz
chromium_src-90a4b9d59dbf2665c1c849e0b12e422e2d9eb426.tar.bz2
Cmd+Q on an app window quits the app.
In applicationShouldTerminate, if the terminate was triggered by a keyboard event, and the currently focused window is a ShellWindow, then quit the app associated with that window and return NSTerminateCancel. An accessor for ExtensionAppShimHandler is added to BrowserProcessPlatFormPart to allow manipulating apps from anywhere. This will also be used for the Quit menu option for app menus. Cmd+Q behavior on a browser window remains mostly unchanged. The only difference is that Cmd+Q when there are no windows quits immediately, even if confirm-to-quit is enabled. Note that this does not affect termination due to OSX shutting down. Even if the shutdown is triggered by a keyboard shortcut (e.g. Ctrl+Cmd+Eject), the event type will be NSSystemDefined, so Chrome terminates as usual. BUG=168080,249059,227472 TEST=Start an app. Cmd+Q with one of the app's windows focused should quit the app. Quit Chrome and start an app using its shim. Cmd+Q on the app should quit the app and Chrome. TEST=Start an app. Ctrl+Cmd+Eject with the app window focused to shut down OSX. Chrome should terminate cleanly. Review URL: https://chromiumcodereview.appspot.com/17448007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/DEPS')
-rw-r--r--apps/DEPS2
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/DEPS b/apps/DEPS
index eda580a..44a0dde 100644
--- a/apps/DEPS
+++ b/apps/DEPS
@@ -12,6 +12,7 @@ include_rules = [
# Temporary allowed includes.
# TODO(benwells): remove these (http://crbug.com/159366)
"+chrome/browser/browser_process.h",
+ "+chrome/browser/browser_shutdown.h",
"+chrome/browser/chrome_notification_types.h",
"+chrome/browser/extensions",
"+chrome/browser/lifetime/application_lifetime.h",
@@ -30,6 +31,7 @@ include_rules = [
"+chrome/common/extensions",
"+chrome/common/mac/app_mode_common.h",
"+chrome/installer",
+ "+chrome/test/base/interactive_test_utils.h",
"+chrome/test/base/testing_profile.h",
"+grit/generated_resources.h",
]