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

chrome/browser/views/accessible_toolbar_view.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 "base/logging.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/location_bar/location_bar_view.h"
 #include "chrome/browser/views/accessible_toolbar_view.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/focus/focus_search.h"
 #include "views/focus/view_storage.h"
 #include "views/widget/tooltip_manager.h"
 #include "views/widget/widget.h"
 
 AccessibleToolbarView::AccessibleToolbarView()
     : toolbar_has_focus_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
       focus_manager_(NULL),
-      home_key_(base::VKEY_HOME, false, false, false),
-      end_key_(base::VKEY_END, false, false, false),
-      escape_key_(base::VKEY_ESCAPE, false, false, false),
-      left_key_(base::VKEY_LEFT, false, false, false),
-      right_key_(base::VKEY_RIGHT, false, false, false),
+      home_key_(app::VKEY_HOME, false, false, false),
+      end_key_(app::VKEY_END, false, false, false),
+      escape_key_(app::VKEY_ESCAPE, false, false, false),
+      left_key_(app::VKEY_LEFT, false, false, false),
+      right_key_(app::VKEY_RIGHT, false, false, false),
       last_focused_view_storage_id_(-1) {
   focus_search_.reset(new views::FocusSearch(this, true, true));
 }
 
 AccessibleToolbarView::~AccessibleToolbarView() {
   if (toolbar_has_focus_) {
     focus_manager_->RemoveFocusChangeListener(this);
   }
 }
 
@@ skipping 105 matching lines @@
     return NULL;
 }
 
 bool AccessibleToolbarView::AcceleratorPressed(
     const views::Accelerator& accelerator) {
   // Special case: don't handle arrows for certain views, like the
   // location bar's edit text view, which need them for text editing.
   views::View* focused_view = focus_manager_->GetFocusedView();
   if ((focused_view->GetClassName() == LocationBarView::kViewClassName ||
        focused_view->GetClassName() == views::NativeViewHost::kViewClassName) &&
-      (accelerator.GetKeyCode() == base::VKEY_LEFT ||
-       accelerator.GetKeyCode() == base::VKEY_RIGHT)) {
+      (accelerator.GetKeyCode() == app::VKEY_LEFT ||
+       accelerator.GetKeyCode() == app::VKEY_RIGHT)) {
     return false;
   }
 
   switch (accelerator.GetKeyCode()) {
-    case base::VKEY_ESCAPE:
+    case app::VKEY_ESCAPE:
       RemoveToolbarFocus();
       RestoreLastFocusedView();
       return true;
-    case base::VKEY_LEFT:
+    case app::VKEY_LEFT:
       focus_manager_->AdvanceFocus(true);
       return true;
-    case base::VKEY_RIGHT:
+    case app::VKEY_RIGHT:
       focus_manager_->AdvanceFocus(false);
       return true;
-    case base::VKEY_HOME:
+    case app::VKEY_HOME:
       focus_manager_->SetFocusedViewWithReason(
           GetFirstFocusableChild(), views::FocusManager::kReasonFocusTraversal);
       return true;
-    case base::VKEY_END:
+    case app::VKEY_END:
       focus_manager_->SetFocusedViewWithReason(
           GetLastFocusableChild(), views::FocusManager::kReasonFocusTraversal);
       return true;
     default:
       return false;
   }
 }
 
 void AccessibleToolbarView::SetVisible(bool flag) {
   if (IsVisible() && !flag && toolbar_has_focus_) {
@@ skipping 46 matching lines @@
 
 views::FocusTraversable* AccessibleToolbarView::GetFocusTraversableParent() {
   DCHECK(toolbar_has_focus_);
   return NULL;
 }
 
 views::View* AccessibleToolbarView::GetFocusTraversableParentView() {
   DCHECK(toolbar_has_focus_);
   return NULL;
 }