summaryrefslogtreecommitdiffstats
path: root/views/accelerator.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 17:36:09 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 17:36:09 +0000
commitb6d81261a469240e25b41e7125bb7166ca3d35bb (patch)
tree9ddaf52100915560ce5c3d0167e79ef4a26aec56 /views/accelerator.h
parent917a44b0724089630cb1d962a9383df7a1deaf7e (diff)
downloadchromium_src-b6d81261a469240e25b41e7125bb7166ca3d35bb.zip
chromium_src-b6d81261a469240e25b41e7125bb7166ca3d35bb.tar.gz
chromium_src-b6d81261a469240e25b41e7125bb7166ca3d35bb.tar.bz2
Move app/key* to ui/base/keycodes/*
BUG=none TEST=none TBR=brettw Review URL: http://codereview.chromium.org/6246001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71330 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/accelerator.h')
-rw-r--r--views/accelerator.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/views/accelerator.h b/views/accelerator.h
index 05fa83b..81e3043 100644
--- a/views/accelerator.h
+++ b/views/accelerator.h
@@ -24,10 +24,10 @@ class Accelerator : public menus::Accelerator {
public:
Accelerator() : menus::Accelerator() {}
- Accelerator(app::KeyboardCode keycode, int modifiers)
+ Accelerator(ui::KeyboardCode keycode, int modifiers)
: menus::Accelerator(keycode, modifiers) {}
- Accelerator(app::KeyboardCode keycode,
+ Accelerator(ui::KeyboardCode keycode,
bool shift_pressed, bool ctrl_pressed, bool alt_pressed) {
key_code_ = keycode;
modifiers_ = 0;