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

views/controls/button/menu_button.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/button/menu_button.h"
 
 #include "app/drag_drop_types.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "gfx/canvas.h"
@@ skipping 201 matching lines @@
   if (GetDragOperations(e.location()) != DragDropTypes::DRAG_NONE &&
       state() != BS_DISABLED && !canceled && !InDrag() &&
       e.IsOnlyLeftMouseButton() && HitTest(e.location())) {
     Activate();
   } else {
     TextButton::OnMouseReleased(e, canceled);
   }
 }
 
 bool MenuButton::OnKeyPressed(const KeyEvent& e) {
-  if (e.GetKeyCode() == app::VKEY_SPACE ||
-      e.GetKeyCode() == app::VKEY_RETURN ||
-      e.GetKeyCode() == app::VKEY_UP ||
-      e.GetKeyCode() == app::VKEY_DOWN) {
+  if (e.GetKeyCode() == base::VKEY_SPACE ||
+      e.GetKeyCode() == base::VKEY_RETURN ||
+      e.GetKeyCode() == base::VKEY_UP ||
+      e.GetKeyCode() == base::VKEY_DOWN) {
     bool result = Activate();
     if (GetFocusManager()->GetFocusedView() == NULL)
       RequestFocus();
     return result;
   }
   return false;
 }
 
 bool MenuButton::OnKeyReleased(const KeyEvent& e) {
   // Override CustomButton's implementation, which presses the button when
@@ skipping 38 matching lines @@
 
   *state = AccessibilityTypes::STATE_HASPOPUP;
   return true;
 }
 
 std::string MenuButton::GetClassName() const {
   return kViewClassName;
 }
 
 }  // namespace views