summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-16 19:51:56 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-16 19:51:56 +0000
commitd56bcd21c5842c72ec0a8cd14c910e1dd4ed7048 (patch)
treeeb64e16a90396c8be28d8ddece03c7f8bf0e4c5e /chrome/browser/cocoa
parent79106726b69152f8ef4bb1a711e3c1d9c7e033f6 (diff)
downloadchromium_src-d56bcd21c5842c72ec0a8cd14c910e1dd4ed7048.zip
chromium_src-d56bcd21c5842c72ec0a8cd14c910e1dd4ed7048.tar.gz
chromium_src-d56bcd21c5842c72ec0a8cd14c910e1dd4ed7048.tar.bz2
Linux accelerators cleanup:
- Give renderer a chance to handle accelerators before browser does. - Handle browser accelerators that aren't attached to any particular UI element in BrowserWindowGtk rather than in BrowserToolbarGtk - Use Browser::ExecuteCommand() to handle accelerator activation - Switch a random void* to gfx::NativeWindow - Enable three browser commands on linux : Focus Location, Focus Search, Open file This fully enables ctrl-l, ctrl-k, and ctrl-o. This fixes copy-pasta in the omnibox. This fixes the problem Dean described with <http://www.quirksmode.org/js/keys.html>. bug=8659 Review URL: http://codereview.chromium.org/42190 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/browser_window_cocoa.h2
-rw-r--r--chrome/browser/cocoa/browser_window_cocoa.mm2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/browser_window_cocoa.h b/chrome/browser/cocoa/browser_window_cocoa.h
index f3f7056..df1eb42 100644
--- a/chrome/browser/cocoa/browser_window_cocoa.h
+++ b/chrome/browser/cocoa/browser_window_cocoa.h
@@ -27,7 +27,7 @@ class BrowserWindowCocoa : public BrowserWindow {
virtual void Activate();
virtual bool IsActive() const;
virtual void FlashFrame();
- virtual void* GetNativeHandle();
+ virtual gfx::NativeWindow GetNativeHandle();
virtual BrowserWindowTesting* GetBrowserWindowTesting();
virtual StatusBubble* GetStatusBubble();
virtual void SelectedTabToolbarSizeChanged(bool is_animating);
diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm
index 0f611b3..1163f1e5 100644
--- a/chrome/browser/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/cocoa/browser_window_cocoa.mm
@@ -52,7 +52,7 @@ bool BrowserWindowCocoa::IsActive() const {
return [window_ isKeyWindow];
}
-void* BrowserWindowCocoa::GetNativeHandle() {
+gfx::NativeWindow BrowserWindowCocoa::GetNativeHandle() {
return [controller_ window];
}