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

Unified Diff: views/controls/native_control.cc

Issue 3361003: Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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
« no previous file with comments | « views/controls/native_control.h ('k') | views/controls/scrollbar/bitmap_scroll_bar.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/native_control.cc
===================================================================
--- views/controls/native_control.cc (revision 58386)
+++ views/controls/native_control.cc (working copy)
@@ -10,8 +10,9 @@
#include <atlframe.h>
#include <atlmisc.h>
+#include "app/keyboard_code_conversion_win.h"
+#include "app/keyboard_codes.h"
#include "app/l10n_util_win.h"
-#include "base/keyboard_codes.h"
#include "base/logging.h"
#include "base/win_util.h"
#include "gfx/native_theme_win.h"
@@ -359,7 +360,7 @@
DCHECK(native_control);
if (message == WM_KEYDOWN &&
- native_control->OnKeyDown(win_util::WinToKeyboardCode(w_param))) {
+ native_control->OnKeyDown(app::KeyboardCodeForWindowsKeyCode(w_param))) {
return 0;
} else if (message == WM_SETFOCUS) {
// Let the focus manager know that the focus changed.
« no previous file with comments | « views/controls/native_control.h ('k') | views/controls/scrollbar/bitmap_scroll_bar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698