Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from bas...

chrome/browser/autocomplete/autocomplete_edit_view_win.cc

 // Copyright (c) 2010 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/clipboard/clipboard.h"
 #include "app/clipboard/scoped_clipboard_writer.h"
-#include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/os_exchange_data.h"
 #include "app/os_exchange_data_provider_win.h"
 #include "app/win_util.h"
 #include "base/auto_reset.h"
 #include "base/base_drag_source.h"
 #include "base/base_drop_target.h"
 #include "base/basictypes.h"
 #include "base/i18n/rtl.h"
 #include "base/iat_patch.h"
+#include "base/keyboard_codes.h"
 #include "base/lazy_instance.h"
 #include "base/ref_counted.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/autocomplete/autocomplete_accessibility.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/keyword_provider.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ skipping 832 matching lines @@
   return command_updater_;
 }
 
 void AutocompleteEditViewWin::PasteAndGo(const std::wstring& text) {
   if (CanPasteAndGo(text))
     model_->PasteAndGo();
 }
 
 bool AutocompleteEditViewWin::SkipDefaultKeyEventProcessing(
     const views::KeyEvent& e) {
-  app::KeyboardCode key = e.GetKeyCode();
+  base::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 != base::VKEY_HOME) &&
       win_util::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 base::VKEY_ESCAPE: {
       ScopedFreeze freeze(this, GetTextObjectModel());
       return model_->OnEscapeKeyPressed();
     }
 
-    case app::VKEY_RETURN:
+    case base::VKEY_RETURN:
       return true;
 
-    case app::VKEY_UP:
-    case app::VKEY_DOWN:
+    case base::VKEY_UP:
+    case base::VKEY_DOWN:
       return !e.IsAltDown();
 
-    case app::VKEY_DELETE:
-    case app::VKEY_INSERT:
+    case base::VKEY_DELETE:
+    case base::VKEY_INSERT:
       return !e.IsAltDown() && e.IsShiftDown() && !e.IsControlDown();
 
-    case app::VKEY_X:
-    case app::VKEY_V:
+    case base::VKEY_X:
+    case base::VKEY_V:
       return !e.IsAltDown() && e.IsControlDown();
 
-    case app::VKEY_BACK:
-    case app::VKEY_OEM_PLUS:
+    case base::VKEY_BACK:
+    case base::VKEY_OEM_PLUS:
       return true;
 
     default:
       return false;
   }
 }
 
 void AutocompleteEditViewWin::HandleExternalMsg(UINT msg,
                                                 UINT flags,
                                                 const CPoint& screen_point) {
@@ skipping 827 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 == base::VKEY_HOME || key == base::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 709 matching lines @@
 void AutocompleteEditViewWin::TrackMousePosition(MouseButton button,
                                                  const CPoint& point) {
   if (gaining_focus_.get()) {
     // This click is giving us focus, so we need to track how much the mouse
     // moves to see if it's a drag or just a click. Clicks should select all
     // the text.
     tracking_click_[button] = true;
     click_point_[button] = point;
   }
 }