diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 19:09:06 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 19:09:06 +0000 |
| commit | 92258389a1a4190987f3b4a64386fd9eb0f126ea (patch) | |
| tree | 567ea0779660a7f822289f3c945721f2e9d6fad1 /views/accelerator.h | |
| parent | 47fa280c2ff011bb948a9978687418079731a854 (diff) | |
| download | chromium_src-92258389a1a4190987f3b4a64386fd9eb0f126ea.zip chromium_src-92258389a1a4190987f3b4a64386fd9eb0f126ea.tar.gz chromium_src-92258389a1a4190987f3b4a64386fd9eb0f126ea.tar.bz2 | |
Revert 58186 - 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=bryeung@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58215 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/accelerator.h')
| -rw-r--r-- | views/accelerator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/views/accelerator.h b/views/accelerator.h index 5cf68f1..08dc201 100644 --- a/views/accelerator.h +++ b/views/accelerator.h @@ -23,10 +23,10 @@ class Accelerator : public menus::Accelerator { public: Accelerator() : menus::Accelerator() {} - Accelerator(app::KeyboardCode keycode, int modifiers) + Accelerator(base::KeyboardCode keycode, int modifiers) : menus::Accelerator(keycode, modifiers) {} - Accelerator(app::KeyboardCode keycode, + Accelerator(base::KeyboardCode keycode, bool shift_pressed, bool ctrl_pressed, bool alt_pressed) { key_code_ = keycode; modifiers_ = 0; |