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

Unified Diff: ui/views/events/event_win.cc

Issue 10825254: Remove views::KeyEvent, replacing uses of it with ui::KeyEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months 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 side-by-side diff with in-line comments
Download patch
Index: ui/views/events/event_win.cc
===================================================================
--- ui/views/events/event_win.cc (revision 150588)
+++ ui/views/events/event_win.cc (working copy)
@@ -1,42 +0,0 @@
-// 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.
-
-#include "ui/views/events/event.h"
-
-#include "base/logging.h"
-#include "base/win/win_util.h"
-#include "ui/base/keycodes/keyboard_code_conversion.h"
-
-namespace views {
-
-////////////////////////////////////////////////////////////////////////////////
-// KeyEvent, public:
-
-uint16 KeyEvent::GetCharacter() const {
- if (character_)
- return character_;
- return (native_event().message == WM_CHAR) ? key_code_ :
- ui::GetCharacterFromKeyCode(key_code_, flags());
-}
-
-uint16 KeyEvent::GetUnmodifiedCharacter() const {
- if (unmodified_character_)
- return unmodified_character_;
- // Looks like there is no way to get unmodified character on Windows.
- return (native_event().message == WM_CHAR) ? key_code_ :
- ui::GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
-}
-
-int GetModifiersFromKeyState() {
- int modifiers = ui::EF_NONE;
- if (base::win::IsShiftPressed())
- modifiers |= ui::EF_SHIFT_DOWN;
- if (base::win::IsCtrlPressed())
- modifiers |= ui::EF_CONTROL_DOWN;
- if (base::win::IsAltPressed())
- modifiers |= ui::EF_ALT_DOWN;
- return modifiers;
-}
-
-} // namespace views

Powered by Google App Engine
This is Rietveld 408576698