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

views/controls/scrollbar/native_scroll_bar_gtk.cc

 // Copyright (c) 2009 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/scrollbar/native_scroll_bar_gtk.h"
 
 #include <gtk/gtk.h>
 
-#include "app/keyboard_codes_posix.h"
+#include "base/keyboard_codes_posix.h"
 #include "views/controls/scrollbar/native_scroll_bar.h"
 #include "views/controls/scrollbar/scroll_bar.h"
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeScrollBarGtk, public:
 
 NativeScrollBarGtk::NativeScrollBarGtk(NativeScrollBar* scroll_bar)
     : NativeControlGtk(),
@@ skipping 18 matching lines @@
   return gfx::Size(GetVerticalScrollBarWidth(), 0);
 }
 
 // TODO(oshima|jcampan): key/mouse events are not delievered and
 // the following code is not tested. It requires the focus manager to be fully
 // implemented.
 bool NativeScrollBarGtk::OnKeyPressed(const KeyEvent& event) {
   if (!native_view())
     return false;
   switch (event.GetKeyCode()) {
-    case app::VKEY_UP:
+    case base::VKEY_UP:
       if (!native_scroll_bar_->IsHorizontal())
         MoveStep(false /* negative */);
       break;
-    case app::VKEY_DOWN:
+    case base::VKEY_DOWN:
       if (!native_scroll_bar_->IsHorizontal())
         MoveStep(true /* positive */);
       break;
-    case app::VKEY_LEFT:
+    case base::VKEY_LEFT:
       if (native_scroll_bar_->IsHorizontal())
         MoveStep(false /* negative */);
       break;
-    case app::VKEY_RIGHT:
+    case base::VKEY_RIGHT:
       if (native_scroll_bar_->IsHorizontal())
         MoveStep(true /* positive */);
       break;
-    case app::VKEY_PRIOR:
+    case base::VKEY_PRIOR:
       MovePage(false /* negative */);
       break;
-    case app::VKEY_NEXT:
+    case base::VKEY_NEXT:
       MovePage(true /* positive */);
       break;
-    case app::VKEY_HOME:
+    case base::VKEY_HOME:
       MoveTo(0);
       break;
-    case app::VKEY_END:
+    case base::VKEY_END:
       MoveToBottom();
       break;
     default:
       return false;
   }
   return true;
 }
 
 bool NativeScrollBarGtk::OnMouseWheel(const MouseWheelEvent& e) {
   if (!native_view())
@@ skipping 124 matching lines @@
   return 20;
 }
 
 // static
 int NativeScrollBarWrapper::GetVerticalScrollBarWidth() {
   // TODO(oshima): get this from gtk's widget property "slider-width".
   return 20;
 }
 
 }  // namespace views