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

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

Issue 6246001: Move app/key* to ui/base/keycodes/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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/accelerator.cc ('k') | views/controls/button/menu_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/button/custom_button.cc
===================================================================
--- views/controls/button/custom_button.cc (revision 71220)
+++ views/controls/button/custom_button.cc (working copy)
@@ -4,8 +4,8 @@
#include "views/controls/button/custom_button.h"
-#include "app/keyboard_codes.h"
#include "ui/base/animation/throb_animation.h"
+#include "ui/base/keycodes/keyboard_codes.h"
#include "views/screen.h"
namespace views {
@@ -203,9 +203,9 @@
// 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() == ui::VKEY_SPACE) {
SetState(BS_PUSHED);
- } else if (e.GetKeyCode() == app::VKEY_RETURN) {
+ } else if (e.GetKeyCode() == ui::VKEY_RETURN) {
SetState(BS_NORMAL);
NotifyClick(e);
} else {
@@ -215,7 +215,7 @@
}
bool CustomButton::OnKeyReleased(const KeyEvent& e) {
- if ((state_ == BS_DISABLED) || (e.GetKeyCode() != app::VKEY_SPACE))
+ if ((state_ == BS_DISABLED) || (e.GetKeyCode() != ui::VKEY_SPACE))
return false;
SetState(BS_NORMAL);
« no previous file with comments | « views/accelerator.cc ('k') | views/controls/button/menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698