diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-05 23:18:30 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-05 23:18:30 +0000 |
| commit | a048ea67799ae6c42589496ba18e62cea9a3dee5 (patch) | |
| tree | 6dcafd25f954a4aafe00cdca4974f572561682d4 /views | |
| parent | 29a2bf9a50604c34842cad04f1e4775993f46b6d (diff) | |
| download | chromium_src-a048ea67799ae6c42589496ba18e62cea9a3dee5.zip chromium_src-a048ea67799ae6c42589496ba18e62cea9a3dee5.tar.gz chromium_src-a048ea67799ae6c42589496ba18e62cea9a3dee5.tar.bz2 | |
Revert "BookmarkBarView tests fixes"
I don't understand why this is still causing the problem, but reverting this for now.
This reverts commit 6bb4f22703226e093644c28afe34d975cc7d549d.
Review URL: http://codereview.chromium.org/1612005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43674 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/menu/menu_controller.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc index 80c081d..625199d 100644 --- a/views/controls/menu/menu_controller.cc +++ b/views/controls/menu/menu_controller.cc @@ -18,9 +18,6 @@ #include "views/view_constants.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" -#if defined(OS_LINUX) -#include "base/keyboard_code_conversion_gtk.h" -#endif using base::Time; using base::TimeDelta; @@ -698,9 +695,7 @@ bool MenuController::Dispatch(GdkEvent* event) { switch (event->type) { case GDK_KEY_PRESS: { - base::KeyboardCode win_keycode = - base::WindowsKeyCodeForGdkKeyCode(event->key.keyval); - if (!OnKeyDown(win_keycode)) + if (!OnKeyDown(event->key.keyval)) return false; guint32 keycode = gdk_keyval_to_unicode(event->key.keyval); if (keycode) @@ -723,7 +718,6 @@ bool MenuController::OnKeyDown(int key_code #endif ) { DCHECK(blocking_run_); - DLOG(WARNING) << "OnKeyDown: " << key_code; switch (key_code) { case base::VKEY_UP: |