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

Unified Diff: views/window/window_win.cc

Issue 6246001: Move app/key* to ui/base/keycodes/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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/window/dialog_client_view.cc ('k') | webkit/support/webkit_support.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/window/window_win.cc
===================================================================
--- views/window/window_win.cc (revision 71220)
+++ views/window/window_win.cc (working copy)
@@ -7,7 +7,6 @@
#include <dwmapi.h>
#include <shellapi.h>
-#include "app/keyboard_code_conversion_win.h"
#include "app/theme_provider.h"
#include "app/win/hwnd_util.h"
#include "app/win/win_util.h"
@@ -17,6 +16,7 @@
#include "gfx/font.h"
#include "gfx/icon_util.h"
#include "gfx/path.h"
+#include "ui/base/keycodes/keyboard_code_conversion_win.h"
#include "views/accessibility/view_accessibility.h"
#include "views/widget/root_view.h"
#include "views/window/client_view.h"
@@ -1175,7 +1175,7 @@
if ((notification_code & sc_mask) == SC_KEYMENU && click.x == 0) {
// Retrieve the status of shift and control keys to prevent consuming
// shift+alt keys, which are used by Windows to change input languages.
- Accelerator accelerator(app::KeyboardCodeForWindowsKeyCode(VK_MENU),
+ Accelerator accelerator(ui::KeyboardCodeForWindowsKeyCode(VK_MENU),
!!(GetKeyState(VK_SHIFT) & 0x8000),
!!(GetKeyState(VK_CONTROL) & 0x8000),
false);
« no previous file with comments | « views/window/dialog_client_view.cc ('k') | webkit/support/webkit_support.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698