Re-lands 58186:

views/controls/button/custom_button.cc

Index: views/controls/button/custom_button.cc
diff --git a/views/controls/button/custom_button.cc b/views/controls/button/custom_button.cc
index 04ff856c348ff3f56ac34d516086a30602b1bbe9..bc949c1e4e10de9a26a9c2516e70395fdefcfd79 100644
--- a/views/controls/button/custom_button.cc
+++ b/views/controls/button/custom_button.cc
@@ -4,8 +4,8 @@
 
 #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 {
@@ -192,9 +192,9 @@ bool CustomButton::OnKeyPressed(const KeyEvent& e) {
   // 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() == base::VKEY_SPACE) {
+  if (e.GetKeyCode() == app::VKEY_SPACE) {
     SetState(BS_PUSHED);
-  } else if (e.GetKeyCode() == base::VKEY_RETURN) {
+  } else if (e.GetKeyCode() == app::VKEY_RETURN) {
     SetState(BS_NORMAL);
     NotifyClick(e);
   } else {
@@ -204,7 +204,7 @@ bool CustomButton::OnKeyPressed(const KeyEvent& e) {
 }
 
 bool CustomButton::OnKeyReleased(const KeyEvent& e) {
-  if ((state_ == BS_DISABLED) || (e.GetKeyCode() != base::VKEY_SPACE))
+  if ((state_ == BS_DISABLED) || (e.GetKeyCode() != app::VKEY_SPACE))
     return false;
 
   SetState(BS_NORMAL);