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

views/controls/tabbed_pane/tabbed_pane.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 "views/controls/tabbed_pane/tabbed_pane.h"
 
-#include "app/keyboard_codes.h"
+#include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
 
 namespace views {
 
 // static
 const char TabbedPane::kViewClassName[] = "views/TabbedPane";
 
 TabbedPane::TabbedPane() : native_tabbed_pane_(NULL), listener_(NULL) {
@@ skipping 57 matching lines @@
   if (is_add && !native_tabbed_pane_) {
     CreateWrapper();
     AddChildView(native_tabbed_pane_->GetView());
     LoadAccelerators();
   }
 }
 
 bool TabbedPane::AcceleratorPressed(const views::Accelerator& accelerator) {
   // We only accept Ctrl+Tab keyboard events.
   DCHECK(accelerator.GetKeyCode() ==
-      app::VKEY_TAB && accelerator.IsCtrlDown());
+      base::VKEY_TAB && accelerator.IsCtrlDown());
 
   int tab_count = GetTabCount();
   if (tab_count <= 1)
     return false;
   int selected_tab_index = GetSelectedTabIndex();
   int next_tab_index = accelerator.IsShiftDown() ?
       (selected_tab_index - 1) % tab_count :
       (selected_tab_index + 1) % tab_count;
   // Wrap around.
   if (next_tab_index < 0)
     next_tab_index += tab_count;
   SelectTabAt(next_tab_index);
   return true;
 }
 
 void TabbedPane::LoadAccelerators() {
   // Ctrl+Shift+Tab
-  AddAccelerator(views::Accelerator(app::VKEY_TAB, true, true, false));
+  AddAccelerator(views::Accelerator(base::VKEY_TAB, true, true, false));
   // Ctrl+Tab
-  AddAccelerator(views::Accelerator(app::VKEY_TAB, false, true, false));
+  AddAccelerator(views::Accelerator(base::VKEY_TAB, false, true, false));
 }
 
 void TabbedPane::Layout() {
   if (native_tabbed_pane_)
     native_tabbed_pane_->GetView()->SetBounds(0, 0, width(), height());
 }
 
 void TabbedPane::Focus() {
   // Forward the focus to the wrapper.
   if (native_tabbed_pane_) {
@@ skipping 19 matching lines @@
   *role = AccessibilityTypes::ROLE_PAGETABLIST;
   return true;
 }
 
 gfx::Size TabbedPane::GetPreferredSize() {
   return native_tabbed_pane_ ?
       native_tabbed_pane_->GetPreferredSize() : gfx::Size();
 }
 
 }  // namespace views