diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-02 01:25:41 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-02 01:25:41 +0000 |
| commit | 97df4b330f4a2b1a34adb1eb8e5f5e7f60d716ff (patch) | |
| tree | 46cd48cb3b533fb88bb6e6975427e7741578cb5c /chrome/browser/cocoa | |
| parent | 7a0f5a3abf37e21eb15f4fe4058e917426e2e105 (diff) | |
| download | chromium_src-97df4b330f4a2b1a34adb1eb8e5f5e7f60d716ff.zip chromium_src-97df4b330f4a2b1a34adb1eb8e5f5e7f60d716ff.tar.gz chromium_src-97df4b330f4a2b1a34adb1eb8e5f5e7f60d716ff.tar.bz2 | |
Don't send tab switching/killing/creating keyboard accelerators to pages. This avoids tabs maliciously preventing closing using ctrl+f4/ctrl+w/alt+f4, and also hung/slow renderers from making tab cycling sluggish.
BUG=5496
TEST=added ui test
Review URL: http://codereview.chromium.org/224023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27814 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
| -rw-r--r-- | chrome/browser/cocoa/browser_window_cocoa.h | 1 | ||||
| -rw-r--r-- | chrome/browser/cocoa/browser_window_cocoa.mm | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/browser_window_cocoa.h b/chrome/browser/cocoa/browser_window_cocoa.h index 922e4f3..73e3bff 100644 --- a/chrome/browser/cocoa/browser_window_cocoa.h +++ b/chrome/browser/cocoa/browser_window_cocoa.h @@ -88,6 +88,7 @@ class BrowserWindowCocoa : public BrowserWindow, bool show_history); virtual void ShowPageMenu(); virtual void ShowAppMenu(); + virtual int GetCommandId(const NativeWebKeyboardEvent& event); // Overridden from NotificationObserver virtual void Observe(NotificationType type, diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm index a83e091..3afae7e 100644 --- a/chrome/browser/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/cocoa/browser_window_cocoa.mm @@ -320,6 +320,12 @@ void BrowserWindowCocoa::ShowAppMenu() { // No-op. Mac doesn't support showing the menus via alt keys. } +int BrowserWindowCocoa::GetCommandId(const NativeWebKeyboardEvent& event) { + // TODO(port): return the command id if this is a keyboard accelerator. + // CommandForKeyboardShortcut() doesn't have the full list. + return -1; +} + void BrowserWindowCocoa::Observe(NotificationType type, const NotificationSource& source, const NotificationDetails& details) { |