From 273bf9e24c8268d80d89b35b3f8de678be5723e6 Mon Sep 17 00:00:00 2001 From: "yusukes@chromium.org" Date: Thu, 5 Jan 2012 04:09:23 +0000 Subject: Do not use ui::GetCharacterFromXEvent when Control is pressed. The function does not take into account the modifier. BUG=107837 TEST=see the bug Review URL: http://codereview.chromium.org/8968011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116451 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/views/events/event_x.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ui/views/events') diff --git a/ui/views/events/event_x.cc b/ui/views/events/event_x.cc index 4bbb27d..ab24ef4 100644 --- a/ui/views/events/event_x.cc +++ b/ui/views/events/event_x.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -63,7 +63,9 @@ uint16 KeyEvent::GetCharacter() const { DCHECK(native_event()->type == KeyPress || native_event()->type == KeyRelease); - uint16 ch = ui::GetCharacterFromXEvent(native_event()); + uint16 ch = 0; + if (!IsControlDown()) + ch = ui::GetCharacterFromXEvent(native_event()); return ch ? ch : ui::GetCharacterFromKeyCode(key_code_, flags()); } -- cgit v1.1