OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/views/dropdown_bar_host.h" | 5 #include "chrome/browser/ui/views/dropdown_bar_host.h" |
6 | 6 |
7 #include <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> |
8 | 8 |
9 #include "chrome/browser/ui/views/frame/browser_view.h" | 9 #include "chrome/browser/ui/views/frame/browser_view.h" |
10 #include "content/browser/tab_contents/tab_contents.h" | 10 #include "content/browser/tab_contents/tab_contents.h" |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 // http://code.google.com/p/chromium/issues/detail?id=75779 | 43 // http://code.google.com/p/chromium/issues/detail?id=75779 |
44 // Hence, the ugly hack below. | 44 // Hence, the ugly hack below. |
45 // TODO(varunjain): remove the hack when the GDK bug | 45 // TODO(varunjain): remove the hack when the GDK bug |
46 // https://bugzilla.gnome.org/show_bug.cgi?id=644836 gets sorted out. | 46 // https://bugzilla.gnome.org/show_bug.cgi?id=644836 gets sorted out. |
47 if (key_event.key_code() == ui::VKEY_RETURN) { | 47 if (key_event.key_code() == ui::VKEY_RETURN) { |
48 wke.text[0] = wke.unmodifiedText[0] = '\r'; | 48 wke.text[0] = wke.unmodifiedText[0] = '\r'; |
49 } | 49 } |
50 | 50 |
51 return wke; | 51 return wke; |
52 #else | 52 #else |
53 return NativeWebKeyboardEvent(&key_event.native_event()->key); | 53 return NativeWebKeyboardEvent(&key_event.gdk_event()->key); |
54 #endif | 54 #endif |
55 } | 55 } |
OLD | NEW |