| Index: views/controls/button/custom_button.cc
|
| diff --git a/views/controls/button/custom_button.cc b/views/controls/button/custom_button.cc
|
| index e87bae92a646d082c0b21eed6f739318f0016d42..e1fbda8608f90abdffdd8cf572aad4d302866f64 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);
|
| }
|
| @@ -202,7 +202,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);
|
|
|