Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Unified Diff: views/controls/button/native_button.cc

Issue 3337006: Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from bas... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/controls/button/menu_button.cc ('k') | views/controls/combobox/combobox.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/button/native_button.cc
===================================================================
--- views/controls/button/native_button.cc (revision 58389)
+++ views/controls/button/native_button.cc (working copy)
@@ -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 @@
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);
}
« no previous file with comments | « views/controls/button/menu_button.cc ('k') | views/controls/combobox/combobox.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698