diff options
Diffstat (limited to 'chrome/browser/ui/views/dropdown_bar_host_gtk.cc')
-rw-r--r-- | chrome/browser/ui/views/dropdown_bar_host_gtk.cc | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/chrome/browser/ui/views/dropdown_bar_host_gtk.cc b/chrome/browser/ui/views/dropdown_bar_host_gtk.cc index a064f3f..dfbdadd 100644 --- a/chrome/browser/ui/views/dropdown_bar_host_gtk.cc +++ b/chrome/browser/ui/views/dropdown_bar_host_gtk.cc @@ -11,10 +11,6 @@ #include "ui/views/widget/widget.h" #include "views/controls/textfield/textfield.h" -#if defined(TOUCH_UI) -#include "ui/base/keycodes/keyboard_code_conversion_gtk.h" -#endif - void DropdownBarHost::SetWidgetPositionNative(const gfx::Rect& new_pos, bool no_redraw) { host_->SetBounds(new_pos); @@ -24,32 +20,5 @@ void DropdownBarHost::SetWidgetPositionNative(const gfx::Rect& new_pos, NativeWebKeyboardEvent DropdownBarHost::GetKeyboardEvent( const TabContents* contents, const views::KeyEvent& key_event) { -#if defined(TOUCH_UI) - // TODO(oshima): This is a copy from - // RenderWidgetHostViewViews::OnKeyPressed(). - // Refactor and eliminate the dup code. - NativeWebKeyboardEvent wke; - wke.type = WebKit::WebInputEvent::KeyDown; - wke.windowsKeyCode = key_event.key_code(); - wke.setKeyIdentifierFromWindowsKeyCode(); - - wke.text[0] = wke.unmodifiedText[0] = - static_cast<unsigned short>(gdk_keyval_to_unicode( - ui::GdkKeyCodeForWindowsKeyCode(key_event.key_code(), - key_event.IsShiftDown() ^ key_event.IsCapsLockDown()))); - - // Due to a bug in GDK, gdk_keyval_to_unicode(keyval) returns 0 if keyval - // is GDK_Return. It should instead return '\r'. This is causing - // http://code.google.com/p/chromium/issues/detail?id=75779 - // Hence, the ugly hack below. - // TODO(varunjain): remove the hack when the GDK bug - // https://bugzilla.gnome.org/show_bug.cgi?id=644836 gets sorted out. - if (key_event.key_code() == ui::VKEY_RETURN) { - wke.text[0] = wke.unmodifiedText[0] = '\r'; - } - - return wke; -#else return NativeWebKeyboardEvent(key_event.gdk_event()); -#endif } |