Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Side by Side Diff: views/events/event_wayland.cc

Issue 8511061: Move GetCharacterFromKeyCode from views::KeyEvent to ui/base/keycodes/keyboard_code_conversion.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review fix Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « views/events/event_aura.cc ('k') | views/events/event_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "views/events/event.h" 5 #include "views/events/event.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/base/keycodes/keyboard_code_conversion.h"
8 9
9 namespace views { 10 namespace views {
10 11
11 ////////////////////////////////////////////////////////////////////////////// 12 //////////////////////////////////////////////////////////////////////////////
12 // KeyEvent, public: 13 // KeyEvent, public:
13 14
14 uint16 KeyEvent::GetCharacter() const { 15 uint16 KeyEvent::GetCharacter() const {
15 return GetCharacterFromKeyCode(key_code_, flags()); 16 return ui::GetCharacterFromKeyCode(key_code_, flags());
16 } 17 }
17 18
18 uint16 KeyEvent::GetUnmodifiedCharacter() const { 19 uint16 KeyEvent::GetUnmodifiedCharacter() const {
19 return GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN); 20 return ui::GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
20 } 21 }
21 22
22 } // namespace views 23 } // namespace views
OLDNEW
« no previous file with comments | « views/events/event_aura.cc ('k') | views/events/event_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698