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

views/controls/button/native_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/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)
 #include "gfx/platform_font_win.h"
 #elif defined(OS_LINUX)
 #include <gdk/gdkkeysyms.h>
 #include "views/screen.h"
 #endif
 
 
@@ skipping 64 matching lines @@
 
   // Update the accessible name whenever the label changes.
   SetAccessibleName(label);
   PreferredSizeChanged();
 }
 
 void NativeButton::SetIsDefault(bool is_default) {
   if (is_default == is_default_)
     return;
   if (is_default)
-    AddAccelerator(Accelerator(app::VKEY_RETURN, false, false, false));
+    AddAccelerator(Accelerator(base::VKEY_RETURN, false, false, false));
   else
-    RemoveAccelerator(Accelerator(app::VKEY_RETURN, false, false, false));
+    RemoveAccelerator(Accelerator(base::VKEY_RETURN, false, false, false));
   SetAppearsAsDefault(is_default);
 }
 
 void NativeButton::SetNeedElevation(bool need_elevation) {
   need_elevation_ = need_elevation;
   if (native_wrapper_)
     native_wrapper_->UpdateLabel();
   PreferredSizeChanged();
 }
 
@@ skipping 125 matching lines @@
   native_wrapper->UpdateEnabled();
   return native_wrapper;
 }
 
 void NativeButton::InitBorder() {
   set_border(Border::CreateEmptyBorder(0, kButtonBorderHWidth, 0,
                                        kButtonBorderHWidth));
 }
 
 }  // namespace views