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

views/controls/button/custom_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/custom_button.h"
 
-#include "app/keyboard_codes.h"
 #include "app/throb_animation.h"
+#include "base/keyboard_codes.h"
 #include "views/screen.h"
 
 namespace views {
 
 // How long the hover animation takes if uninterrupted.
 static const int kHoverFadeDurationMs = 150;
 
 ////////////////////////////////////////////////////////////////////////////////
 // CustomButton, public:
 
@@ skipping 166 matching lines @@
     SetState(BS_NORMAL);
 }
 
 bool CustomButton::OnKeyPressed(const KeyEvent& e) {
   if (state_ == BS_DISABLED)
     return false;
 
   // Space sets button state to pushed. Enter clicks the button. This matches
   // the Windows native behavior of buttons, where Space clicks the button on
   // KeyRelease and Enter clicks the button on KeyPressed.
-  if (e.GetKeyCode() == app::VKEY_SPACE) {
+  if (e.GetKeyCode() == base::VKEY_SPACE) {
     SetState(BS_PUSHED);
-  } else if (e.GetKeyCode() == app::VKEY_RETURN) {
+  } else if (e.GetKeyCode() == base::VKEY_RETURN) {
     SetState(BS_NORMAL);
     NotifyClick(e);
   } else {
     return false;
   }
   return true;
 }
 
 bool CustomButton::OnKeyReleased(const KeyEvent& e) {
-  if ((state_ == BS_DISABLED) || (e.GetKeyCode() != app::VKEY_SPACE))
+  if ((state_ == BS_DISABLED) || (e.GetKeyCode() != base::VKEY_SPACE))
     return false;
 
   SetState(BS_NORMAL);
   NotifyClick(e);
   return true;
 }
 
 void CustomButton::OnDragDone() {
   SetState(BS_NORMAL);
 }
@@ skipping 37 matching lines @@
 
 void CustomButton::AnimationProgressed(const Animation* animation) {
   SchedulePaint();
 }
 
 bool CustomButton::ShouldEnterPushedState(const MouseEvent& e) {
   return IsTriggerableEvent(e);
 }
 
 }  // namespace views