Re-lands 58186:

views/controls/button/native_button.cc

Index: views/controls/button/native_button.cc
diff --git a/views/controls/button/native_button.cc b/views/controls/button/native_button.cc
index 4c66b9fb4aec1a7fe068e538d3c8ddba9025718c..89dae9c24d70f60f59237c88c4a67ee5f1ec93cc 100644
--- a/views/controls/button/native_button.cc
+++ b/views/controls/button/native_button.cc
@@ -4,8 +4,8 @@
 
 #include "views/controls/button/native_button.h"
 
+#include "app/keyboard_codes.h"
 #include "base/i18n/rtl.h"
-#include "base/keyboard_codes.h"
 #include "views/controls/native/native_view_host.h"
 
 #if defined(OS_WIN)
@@ -90,9 +90,9 @@ void NativeButton::SetIsDefault(bool is_default) {
   if (is_default == is_default_)
     return;
   if (is_default)
-    AddAccelerator(Accelerator(base::VKEY_RETURN, false, false, false));
+    AddAccelerator(Accelerator(app::VKEY_RETURN, false, false, false));
   else
-    RemoveAccelerator(Accelerator(base::VKEY_RETURN, false, false, false));
+    RemoveAccelerator(Accelerator(app::VKEY_RETURN, false, false, false));
   SetAppearsAsDefault(is_default);
 }