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

views/controls/scrollbar/native_scroll_bar_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 "views/controls/scrollbar/native_scroll_bar_win.h"
 
 #include <algorithm>
 #include <string>
 
-#include "app/keyboard_codes.h"
+#include "base/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "gfx/window_impl.h"
 #include "views/controls/scrollbar/native_scroll_bar.h"
 #include "views/controls/scrollbar/scroll_bar.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ skipping 203 matching lines @@
   if (native_scroll_bar_->IsHorizontal())
     return gfx::Size(0, GetHorizontalScrollBarHeight());
   return gfx::Size(GetVerticalScrollBarWidth(), 0);
 }
 
 bool NativeScrollBarWin::OnKeyPressed(const KeyEvent& event) {
   if (!sb_container_.get())
     return false;
   int code = -1;
   switch (event.GetKeyCode()) {
-    case app::VKEY_UP:
+    case base::VKEY_UP:
       if (!native_scroll_bar_->IsHorizontal())
         code = SB_LINEUP;
       break;
-    case app::VKEY_PRIOR:
+    case base::VKEY_PRIOR:
       code = SB_PAGEUP;
       break;
-    case app::VKEY_NEXT:
+    case base::VKEY_NEXT:
       code = SB_PAGEDOWN;
       break;
-    case app::VKEY_DOWN:
+    case base::VKEY_DOWN:
       if (!native_scroll_bar_->IsHorizontal())
         code = SB_LINEDOWN;
       break;
-    case app::VKEY_HOME:
+    case base::VKEY_HOME:
       code = SB_TOP;
       break;
-    case app::VKEY_END:
+    case base::VKEY_END:
       code = SB_BOTTOM;
       break;
-    case app::VKEY_LEFT:
+    case base::VKEY_LEFT:
       if (native_scroll_bar_->IsHorizontal())
         code = SB_LINELEFT;
       break;
-    case app::VKEY_RIGHT:
+    case base::VKEY_RIGHT:
       if (native_scroll_bar_->IsHorizontal())
         code = SB_LINERIGHT;
       break;
   }
   if (code != -1) {
     SendMessage(sb_container_->hwnd(),
                 native_scroll_bar_->IsHorizontal() ? WM_HSCROLL : WM_VSCROLL,
                 MAKELONG(static_cast<WORD>(code), 0), 0L);
     return true;
   }
@@ skipping 71 matching lines @@
 int NativeScrollBarWrapper::GetHorizontalScrollBarHeight() {
   return GetSystemMetrics(SM_CYHSCROLL);
 }
 
 // static
 int NativeScrollBarWrapper::GetVerticalScrollBarWidth() {
   return GetSystemMetrics(SM_CXVSCROLL);
 }
 
 }  // namespace views