diff options
| author | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 16:39:26 +0000 |
|---|---|---|
| committer | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 16:39:26 +0000 |
| commit | 1eed61535cb6e15015edac43177ccdc25140855a (patch) | |
| tree | 843a3c3b42bfaadc54cd6c835e4c313965a0e177 /views/window | |
| parent | de6aadf4ddf69c76ddd60e03451fdbcb4061283f (diff) | |
| download | chromium_src-1eed61535cb6e15015edac43177ccdc25140855a.zip chromium_src-1eed61535cb6e15015edac43177ccdc25140855a.tar.gz chromium_src-1eed61535cb6e15015edac43177ccdc25140855a.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
| -rw-r--r-- | views/window/dialog_client_view.cc | 10 | ||||
| -rw-r--r-- | views/window/window_win.cc | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc index bbc7672..9dd45ac 100644 --- a/views/window/dialog_client_view.cc +++ b/views/window/dialog_client_view.cc @@ -14,9 +14,9 @@ #include <algorithm> +#include "app/keyboard_codes.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" -#include "base/keyboard_codes.h" #include "gfx/canvas_skia.h" #include "gfx/font.h" #include "grit/app_strings.h" @@ -139,7 +139,7 @@ void DialogClientView::ShowDialogButtons() { if (is_default_button) default_button_ = ok_button_; if (!(buttons & MessageBoxFlags::DIALOGBUTTON_CANCEL)) - ok_button_->AddAccelerator(Accelerator(base::VKEY_ESCAPE, + ok_button_->AddAccelerator(Accelerator(app::VKEY_ESCAPE, false, false, false)); AddChildView(ok_button_); } @@ -160,7 +160,7 @@ void DialogClientView::ShowDialogButtons() { MessageBoxFlags::DIALOGBUTTON_CANCEL, label, is_default_button); cancel_button_->SetGroup(kButtonGroup); - cancel_button_->AddAccelerator(Accelerator(base::VKEY_ESCAPE, + cancel_button_->AddAccelerator(Accelerator(app::VKEY_ESCAPE, false, false, false)); if (is_default_button) default_button_ = ok_button_; @@ -169,7 +169,7 @@ void DialogClientView::ShowDialogButtons() { if (!buttons) { // Register the escape key as an accelerator which will close the window // if there are no dialog buttons. - AddAccelerator(Accelerator(base::VKEY_ESCAPE, false, false, false)); + AddAccelerator(Accelerator(app::VKEY_ESCAPE, false, false, false)); } } @@ -387,7 +387,7 @@ gfx::Size DialogClientView::GetPreferredSize() { bool DialogClientView::AcceleratorPressed(const Accelerator& accelerator) { // We only expect Escape key. - DCHECK(accelerator.GetKeyCode() == base::VKEY_ESCAPE); + DCHECK(accelerator.GetKeyCode() == app::VKEY_ESCAPE); Close(); return true; } diff --git a/views/window/window_win.cc b/views/window/window_win.cc index af03463..6aa5224 100644 --- a/views/window/window_win.cc +++ b/views/window/window_win.cc @@ -7,6 +7,7 @@ #include <dwmapi.h> #include <shellapi.h> +#include "app/keyboard_code_conversion_win.h" #include "app/theme_provider.h" #include "app/win_util.h" #include "base/i18n/rtl.h" @@ -1120,7 +1121,7 @@ void WindowWin::OnSysCommand(UINT notification_code, CPoint click) { // Handle SC_KEYMENU, which means that the user has pressed the ALT // key and released it, so we should focus the menu bar. if ((notification_code & sc_mask) == SC_KEYMENU && click.x == 0) { - Accelerator accelerator(win_util::WinToKeyboardCode(VK_MENU), + Accelerator accelerator(app::KeyboardCodeForWindowsKeyCode(VK_MENU), false, false, false); GetFocusManager()->ProcessAccelerator(accelerator); return; |