Move app/key* to ui/base/keycodes/*

BUG=none
TEST=none
TBR=brettw

Review URL: http://codereview.chromium.org/6246001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71330 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 7 deletions

diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc
index ad89187..1eda791 100644
--- a/views/window/dialog_client_view.cc
+++ b/views/window/dialog_client_view.cc
@@ -14,13 +14,13 @@
 
 #include <algorithm>
 
-#include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/font.h"
 #include "grit/app_strings.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 #include "views/controls/button/native_button.h"
 #include "views/standard_layout.h"
 #include "views/window/dialog_delegate.h"
@@ -140,7 +140,7 @@ void DialogClientView::ShowDialogButtons() {
     if (is_default_button)
       default_button_ = ok_button_;
     if (!(buttons & MessageBoxFlags::DIALOGBUTTON_CANCEL))
-      ok_button_->AddAccelerator(Accelerator(app::VKEY_ESCAPE,
+      ok_button_->AddAccelerator(Accelerator(ui::VKEY_ESCAPE,
                                              false, false, false));
     AddChildView(ok_button_);
   }
@@ -161,7 +161,7 @@ void DialogClientView::ShowDialogButtons() {
                                       MessageBoxFlags::DIALOGBUTTON_CANCEL,
                                       label, is_default_button);
     cancel_button_->SetGroup(kButtonGroup);
-    cancel_button_->AddAccelerator(Accelerator(app::VKEY_ESCAPE,
+    cancel_button_->AddAccelerator(Accelerator(ui::VKEY_ESCAPE,
                                                false, false, false));
     if (is_default_button)
       default_button_ = ok_button_;
@@ -170,7 +170,7 @@ void DialogClientView::ShowDialogButtons() {
   if (!buttons) {
     // Register the escape key as an accelerator which will close the window
     // if there are no dialog buttons.
-    AddAccelerator(Accelerator(app::VKEY_ESCAPE, false, false, false));
+    AddAccelerator(Accelerator(ui::VKEY_ESCAPE, false, false, false));
   }
 }
 
@@ -388,7 +388,7 @@ gfx::Size DialogClientView::GetPreferredSize() {
 
 bool DialogClientView::AcceleratorPressed(const Accelerator& accelerator) {
   // We only expect Escape key.
-  DCHECK(accelerator.GetKeyCode() == app::VKEY_ESCAPE);
+  DCHECK(accelerator.GetKeyCode() == ui::VKEY_ESCAPE);
   Close();
   return true;
 }
diff --git a/views/window/window_win.cc b/views/window/window_win.cc
index c0f4523..5a424c3 100644
--- a/views/window/window_win.cc
+++ b/views/window/window_win.cc
@@ -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 @@ void WindowWin::OnSysCommand(UINT notification_code, CPoint click) {
   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);