diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 15:49:40 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 15:49:40 +0000 |
| commit | 44cbd9e3734527f73a83f8a864be0bb5ccae0a7a (patch) | |
| tree | a997fb0565558d63e0eab62b631ef984de3e9596 /views/accelerator.h | |
| parent | 0c1c047d641a599ffffa280ab50d564cedb3e436 (diff) | |
| download | chromium_src-44cbd9e3734527f73a83f8a864be0bb5ccae0a7a.zip chromium_src-44cbd9e3734527f73a83f8a864be0bb5ccae0a7a.tar.gz chromium_src-44cbd9e3734527f73a83f8a864be0bb5ccae0a7a.tar.bz2 | |
Move models from app to ui/base/models
BUG=none
TEST=none
TBR=brettw
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/accelerator.h')
| -rw-r--r-- | views/accelerator.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/views/accelerator.h b/views/accelerator.h index 81e3043..5b37198 100644 --- a/views/accelerator.h +++ b/views/accelerator.h @@ -14,18 +14,18 @@ #include <string> -#include "app/menus/accelerator.h" #include "base/string16.h" +#include "ui/base/models/accelerator.h" #include "views/event.h" namespace views { -class Accelerator : public menus::Accelerator { +class Accelerator : public ui::Accelerator { public: - Accelerator() : menus::Accelerator() {} + Accelerator() : ui::Accelerator() {} Accelerator(ui::KeyboardCode keycode, int modifiers) - : menus::Accelerator(keycode, modifiers) {} + : ui::Accelerator(keycode, modifiers) {} Accelerator(ui::KeyboardCode keycode, bool shift_pressed, bool ctrl_pressed, bool alt_pressed) { |