summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-10 10:47:46 +0000
committerivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-10 10:47:46 +0000
commit74697dc407d245a4d5f908db1ab7730415cbb614 (patch)
treef51449859ef35ee6da8a616dc101302f18864f0c /ui
parent64abb0dae6dcdce7a49c7f2efc3ae1ad6b2c8f7c (diff)
downloadchromium_src-74697dc407d245a4d5f908db1ab7730415cbb614.zip
chromium_src-74697dc407d245a4d5f908db1ab7730415cbb614.tar.gz
chromium_src-74697dc407d245a4d5f908db1ab7730415cbb614.tar.bz2
[gtk] Fix regression from r116541: double keyboard event handling.
BUG=chromium-os:25133 TEST=Manual: see bug description Review URL: http://codereview.chromium.org/9373026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/views/widget/native_widget_gtk.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/views/widget/native_widget_gtk.cc b/ui/views/widget/native_widget_gtk.cc
index 338e49f..439644c 100644
--- a/ui/views/widget/native_widget_gtk.cc
+++ b/ui/views/widget/native_widget_gtk.cc
@@ -565,7 +565,8 @@ void NativeWidgetGtk::ActiveWindowChanged(GdkWindow* active_window) {
bool NativeWidgetGtk::HandleKeyboardEvent(const KeyEvent& key) {
if (!GetWidget()->GetFocusManager())
return false;
- return GetWidget()->GetFocusManager()->OnKeyEvent(key);
+ // FocusManager::OnKeyEvent() returns false when the key has been consumed.
+ return !GetWidget()->GetFocusManager()->OnKeyEvent(key);
}
bool NativeWidgetGtk::SuppressFreezeUpdates() {