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

1 files changed, 3 insertions, 3 deletions

diff --git a/views/controls/link.cc b/views/controls/link.cc
index a9b8d7e..14bc112 100644
--- a/views/controls/link.cc
+++ b/views/controls/link.cc
@@ -127,10 +127,10 @@ bool Link::OnKeyPressed(const KeyEvent& e) {
   return false;
 }
 
-bool Link::OverrideAccelerator(const Accelerator& accelerator) {
+bool Link::SkipDefaultKeyEventProcessing(const KeyEvent& e) {
 #if defined(OS_WIN)
-  return (accelerator.GetKeyCode() == VK_SPACE) ||
-         (accelerator.GetKeyCode() == VK_RETURN);
+  // Make sure we don't process space or enter as accelerators.
+  return (e.GetCharacter() == VK_SPACE) || (e.GetCharacter() == VK_RETURN);
 #else
   NOTIMPLEMENTED();
   return false;