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/controls/menu/menu_win.cc | |
| 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/controls/menu/menu_win.cc')
| -rw-r--r-- | views/controls/menu/menu_win.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/views/controls/menu/menu_win.cc b/views/controls/menu/menu_win.cc index 0c75743..90637a0 100644 --- a/views/controls/menu/menu_win.cc +++ b/views/controls/menu/menu_win.cc @@ -6,9 +6,9 @@ #include <string> -#include "app/keyboard_codes.h" #include "app/l10n_util.h" #include "app/l10n_util_win.h" +#include "base/keyboard_codes.h" #include "base/logging.h" #include "base/stl_util-inl.h" #include "base/string_util.h" @@ -443,7 +443,7 @@ void MenuWin::AddMenuItemInternal(int index, delegate()->GetLabel(item_id) : label); // Find out if there is a shortcut we need to append to the label. - views::Accelerator accelerator(app::VKEY_UNKNOWN, false, false, false); + views::Accelerator accelerator(base::VKEY_UNKNOWN, false, false, false); if (delegate() && delegate()->GetAcceleratorInfo(item_id, &accelerator)) { actual_label += L'\t'; actual_label += accelerator.GetShortcutText(); |