Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/....

chrome/browser/views/find_bar_host.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/views/find_bar_host.h"
 
-#include "base/keyboard_codes.h"
+#include "app/keyboard_codes.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/find_bar_view.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "views/focus/external_focus_tracker.h"
@@ skipping 23 matching lines @@
 }
 
 bool FindBarHost::MaybeForwardKeystrokeToWebpage(
     const views::Textfield::Keystroke& key_stroke) {
   if (!ShouldForwardKeystrokeToWebpageNative(key_stroke)) {
     // Native implementation says not to forward these events.
     return false;
   }
 
   switch (key_stroke.GetKeyboardCode()) {
-    case base::VKEY_DOWN:
-    case base::VKEY_UP:
-    case base::VKEY_PRIOR:
-    case base::VKEY_NEXT:
+    case app::VKEY_DOWN:
+    case app::VKEY_UP:
+    case app::VKEY_PRIOR:
+    case app::VKEY_NEXT:
       break;
-    case base::VKEY_HOME:
-    case base::VKEY_END:
+    case app::VKEY_HOME:
+    case app::VKEY_END:
       if (key_stroke.IsControlHeld())
         break;
     // Fall through.
     default:
       return false;
   }
 
   TabContents* contents = find_bar_controller_->tab_contents();
   if (!contents)
     return false;
@@ skipping 86 matching lines @@
 }
 
 FindBarTesting* FindBarHost::GetFindBarTesting() {
   return this;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // FindBarWin, views::AcceleratorTarget implementation:
 
 bool FindBarHost::AcceleratorPressed(const views::Accelerator& accelerator) {
-  base::KeyboardCode key = accelerator.GetKeyCode();
-  if (key == base::VKEY_RETURN && accelerator.IsCtrlDown()) {
+  app::KeyboardCode key = accelerator.GetKeyCode();
+  if (key == app::VKEY_RETURN && accelerator.IsCtrlDown()) {
     // Ctrl+Enter closes the Find session and navigates any link that is active.
     find_bar_controller_->EndFindSession(FindBarController::kActivateSelection);
-  } else if (key == base::VKEY_ESCAPE) {
+  } else if (key == app::VKEY_ESCAPE) {
     // This will end the Find session and hide the window, causing it to loose
     // focus and in the process unregister us as the handler for the Escape
     // accelerator through the FocusWillChange event.
     find_bar_controller_->EndFindSession(FindBarController::kKeepSelection);
   } else {
     NOTREACHED() << "Unknown accelerator";
   }
 
   return true;
 }
@@ skipping 91 matching lines @@
   DCHECK(bounds);
   // The BrowserView does Layout for the components that we care about
   // positioning relative to, so we ask it to tell us where we should go.
   *bounds = browser_view()->GetFindBarBoundingBox();
 }
 
 void FindBarHost::RegisterAccelerators() {
   DropdownBarHost::RegisterAccelerators();
 
   // Register for Ctrl+Return.
-  views::Accelerator escape(base::VKEY_RETURN, false, true, false);
+  views::Accelerator escape(app::VKEY_RETURN, false, true, false);
   focus_manager()->RegisterAccelerator(escape, this);
 }
 
 void FindBarHost::UnregisterAccelerators() {
   // Unregister Ctrl+Return.
-  views::Accelerator escape(base::VKEY_RETURN, false, true, false);
+  views::Accelerator escape(app::VKEY_RETURN, false, true, false);
   focus_manager()->UnregisterAccelerator(escape, this);
 
   DropdownBarHost::UnregisterAccelerators();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // private:
 
 FindBarView* FindBarHost::find_bar_view() {
   return static_cast<FindBarView*>(view());
 }