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 /chrome/browser/views/task_manager_view.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 'chrome/browser/views/task_manager_view.cc')
-rw-r--r-- | chrome/browser/views/task_manager_view.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/views/task_manager_view.cc b/chrome/browser/views/task_manager_view.cc index 9a3e923..d4bdbce 100644 --- a/chrome/browser/views/task_manager_view.cc +++ b/chrome/browser/views/task_manager_view.cc @@ -222,7 +222,7 @@ class TaskManagerView : public views::View, // views::TableViewObserver implementation. virtual void OnSelectionChanged(); virtual void OnDoubleClick(); - virtual void OnKeyDown(app::KeyboardCode keycode); + virtual void OnKeyDown(base::KeyboardCode keycode); // views::LinkController implementation. virtual void LinkActivated(views::Link* source, int event_flags); @@ -372,7 +372,7 @@ void TaskManagerView::Init() { } kill_button_ = new views::NativeButton( this, l10n_util::GetString(IDS_TASK_MANAGER_KILL)); - kill_button_->AddAccelerator(views::Accelerator(app::VKEY_E, + kill_button_->AddAccelerator(views::Accelerator(base::VKEY_E, false, false, false)); kill_button_->SetAccessibleKeyboardShortcut(L"E"); about_memory_link_ = new views::Link( @@ -588,8 +588,8 @@ void TaskManagerView::OnDoubleClick() { ActivateFocusedTab(); } -void TaskManagerView::OnKeyDown(app::KeyboardCode keycode) { - if (keycode == app::VKEY_RETURN) +void TaskManagerView::OnKeyDown(base::KeyboardCode keycode) { + if (keycode == base::VKEY_RETURN) ActivateFocusedTab(); } |