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

chrome/browser/autocomplete/autocomplete_edit_view_win.cc

 // Copyright (c) 2011 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 "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
 #include <richedit.h>
 #include <textserv.h>
 
-#include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/win/drag_source.h"
 #include "app/win/drop_target.h"
 #include "app/win/iat_patch_function.h"
 #include "app/win/win_util.h"
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
@@ skipping 18 matching lines @@
 #include "googleurl/src/url_util.h"
 #include "gfx/canvas.h"
 #include "gfx/canvas_skia.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "skia/ext/skia_utils_win.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 #include "views/drag_utils.h"
 #include "views/focus/focus_util_win.h"
 #include "views/widget/widget.h"
 
 #pragma comment(lib, "oleacc.lib")  // Needed for accessibility support.
 #pragma comment(lib, "riched20.lib")  // Needed for the richedit control.
 
 ///////////////////////////////////////////////////////////////////////////////
 // AutocompleteEditModel
 
@@ skipping 870 matching lines @@
   return true;
 }
 
 void AutocompleteEditViewWin::PasteAndGo(const std::wstring& text) {
   if (CanPasteAndGo(text))
     model_->PasteAndGo();
 }
 
 bool AutocompleteEditViewWin::SkipDefaultKeyEventProcessing(
     const views::KeyEvent& e) {
-  app::KeyboardCode key = e.GetKeyCode();
+  ui::KeyboardCode key = e.GetKeyCode();
   // We don't process ALT + numpad digit as accelerators, they are used for
   // entering special characters.  We do translate alt-home.
-  if (e.IsAltDown() && (key != app::VKEY_HOME) &&
+  if (e.IsAltDown() && (key != ui::VKEY_HOME) &&
       app::win::IsNumPadDigit(key, e.IsExtendedKey()))
     return true;
 
   // Skip accelerators for key combinations omnibox wants to crack. This list
   // should be synced with OnKeyDownOnlyWritable() (but for tab which is dealt
   // with above in LocationBarView::SkipDefaultKeyEventProcessing).
   //
   // We cannot return true for all keys because we still need to handle some
   // accelerators (e.g., F5 for reload the page should work even when the
   // Omnibox gets focused).
   switch (key) {
-    case app::VKEY_ESCAPE: {
+    case ui::VKEY_ESCAPE: {
       ScopedFreeze freeze(this, GetTextObjectModel());
       return model_->OnEscapeKeyPressed();
     }
 
-    case app::VKEY_RETURN:
+    case ui::VKEY_RETURN:
       return true;
 
-    case app::VKEY_UP:
-    case app::VKEY_DOWN:
+    case ui::VKEY_UP:
+    case ui::VKEY_DOWN:
       return !e.IsAltDown();
 
-    case app::VKEY_DELETE:
-    case app::VKEY_INSERT:
+    case ui::VKEY_DELETE:
+    case ui::VKEY_INSERT:
       return !e.IsAltDown() && e.IsShiftDown() && !e.IsControlDown();
 
-    case app::VKEY_X:
-    case app::VKEY_V:
+    case ui::VKEY_X:
+    case ui::VKEY_V:
       return !e.IsAltDown() && e.IsControlDown();
 
-    case app::VKEY_BACK:
-    case app::VKEY_OEM_PLUS:
+    case ui::VKEY_BACK:
+    case ui::VKEY_OEM_PLUS:
       return true;
 
     default:
       return false;
   }
 }
 
 void AutocompleteEditViewWin::HandleExternalMsg(UINT msg,
                                                 UINT flags,
                                                 const CPoint& screen_point) {
@@ skipping 838 matching lines @@
   return 0;
 }
 
 void AutocompleteEditViewWin::HandleKeystroke(UINT message,
                                               TCHAR key,
                                               UINT repeat_count,
                                               UINT flags) {
   ScopedFreeze freeze(this, GetTextObjectModel());
   OnBeforePossibleChange();
 
-  if (key == app::VKEY_HOME || key == app::VKEY_END) {
+  if (key == ui::VKEY_HOME || key == ui::VKEY_END) {
     // DefWindowProc() might reset the keyboard layout when it receives a
     // keydown event for VKEY_HOME or VKEY_END. When the window was created
     // with WS_EX_LAYOUTRTL and the current keyboard layout is not a RTL one,
     // if the input text is pure LTR text, the layout changes to the first RTL
     // keyboard layout in keyboard layout queue; if the input text is
     // bidirectional text, the layout changes to the keyboard layout of the
     // first RTL character in input text. When the window was created without
     // WS_EX_LAYOUTRTL and the current keyboard layout is not a LTR one, if the
     // input text is pure RTL text, the layout changes to English; if the input
     // text is bidirectional text, the layout changes to the keyboard layout of
@@ skipping 761 matching lines @@
 
 bool AutocompleteEditViewWin::IsImeComposing() const {
   bool ime_composing = false;
   HIMC context = ImmGetContext(m_hWnd);
   if (context) {
     ime_composing = !!ImmGetCompositionString(context, GCS_COMPSTR, NULL, 0);
     ImmReleaseContext(m_hWnd, context);
   }
   return ime_composing;
 }