diff options
author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 22:00:37 +0000 |
---|---|---|
committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 22:00:37 +0000 |
commit | d1d1f9f14a63c8b8a6b882c5e9bf5f67eeb3d574 (patch) | |
tree | 1103bbdb29bb7f8608ceb6f4e226af72d13c0479 /chrome/browser/views/location_bar_view.h | |
parent | d4ad1947465c74539226d34254537cfea9aa2e81 (diff) | |
download | chromium_src-d1d1f9f14a63c8b8a6b882c5e9bf5f67eeb3d574.zip chromium_src-d1d1f9f14a63c8b8a6b882c5e9bf5f67eeb3d574.tar.gz chromium_src-d1d1f9f14a63c8b8a6b882c5e9bf5f67eeb3d574.tar.bz2 |
Some previous refactoring I did of the accelerator code had introduced regressions (pressing ESC would close the dialog instead of closing an opened combo-box, pressing enter on a dialog with a focused link would not open the link).Looking at fixing these I realized the method View::OvverideAccelerator was not needed anymore as View::SkipDefaultKeyEventProcessing supersedes it.So I removed View::OvverideAccelerator. As a result I also ended up moving some Windows specific code from LocationbarView to AutocompleteEditViewWin.BUG=6900TEST=Open the option dialog, click on a combo-box to open the drop-down list. Press ESC, the drop-down list should be closed. Move the focus to a link (by pressing Tab). Press Enter, the link should be opened and the option dialog should not be closed. Make sure that accelerators (ESC, tab, key up/down...) still work ok in the omnibox)
Review URL: http://codereview.chromium.org/119016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17544 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/location_bar_view.h')
-rw-r--r-- | chrome/browser/views/location_bar_view.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/views/location_bar_view.h b/chrome/browser/views/location_bar_view.h index de3d9bf..434fbed 100644 --- a/chrome/browser/views/location_bar_view.h +++ b/chrome/browser/views/location_bar_view.h @@ -115,7 +115,7 @@ class LocationBarView : public LocationBar, bool GetAccessibleRole(AccessibilityTypes::Role* role); // Overridden from views::View: - virtual bool OverrideAccelerator(const views::Accelerator& accelerator); + virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e); // Overridden from LocationBar: virtual void ShowFirstRunBubble(bool use_OEM_bubble); @@ -139,9 +139,6 @@ class LocationBarView : public LocationBar, protected: void Focus(); - // Overridden from Chrome::View. - virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& event); - private: // View used when the user has selected a keyword. // |