summaryrefslogtreecommitdiffstats
path: root/views/controls/link.cc
diff options
context:
space:
mode:
authorbryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 00:38:27 +0000
committerbryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 00:38:27 +0000
commit7f05552488f8f9ea5000512fd1972894aee7ee82 (patch)
tree0e2ed5a562335907e44307a1d99e9c6ab8d8a3ec /views/controls/link.cc
parent9d7e8fd4a448491817b816585d6f375d71c0a97a (diff)
downloadchromium_src-7f05552488f8f9ea5000512fd1972894aee7ee82.zip
chromium_src-7f05552488f8f9ea5000512fd1972894aee7ee82.tar.gz
chromium_src-7f05552488f8f9ea5000512fd1972894aee7ee82.tar.bz2
Re-lands 58186:
Original message: """ Move the keyboard files from base/ to app/. Also moves the associated classes/enums from base:: to app::. TEST=try bots compile BUG=NONE Review URL: http://codereview.chromium.org/3165064 """ TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3354005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58438 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/link.cc')
-rw-r--r--views/controls/link.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/views/controls/link.cc b/views/controls/link.cc
index 97dc01f..6cf81d3 100644
--- a/views/controls/link.cc
+++ b/views/controls/link.cc
@@ -8,7 +8,7 @@
#include <gdk/gdk.h>
#endif
-#include "base/keyboard_codes.h"
+#include "app/keyboard_codes.h"
#include "base/logging.h"
#include "gfx/color_utils.h"
#include "gfx/font.h"
@@ -122,8 +122,8 @@ void Link::OnMouseReleased(const MouseEvent& e, bool canceled) {
}
bool Link::OnKeyPressed(const KeyEvent& e) {
- bool activate = ((e.GetKeyCode() == base::VKEY_SPACE) ||
- (e.GetKeyCode() == base::VKEY_RETURN));
+ bool activate = ((e.GetKeyCode() == app::VKEY_SPACE) ||
+ (e.GetKeyCode() == app::VKEY_RETURN));
if (!activate)
return false;
@@ -140,8 +140,8 @@ bool Link::OnKeyPressed(const KeyEvent& e) {
bool Link::SkipDefaultKeyEventProcessing(const KeyEvent& e) {
// Make sure we don't process space or enter as accelerators.
- return (e.GetKeyCode() == base::VKEY_SPACE) ||
- (e.GetKeyCode() == base::VKEY_RETURN);
+ return (e.GetKeyCode() == app::VKEY_SPACE) ||
+ (e.GetKeyCode() == app::VKEY_RETURN);
}
bool Link::GetAccessibleRole(AccessibilityTypes::Role* role) {