Re-lands 58186:

chrome/browser/views/task_manager_view.cc

Index: chrome/browser/views/task_manager_view.cc
diff --git a/chrome/browser/views/task_manager_view.cc b/chrome/browser/views/task_manager_view.cc
index d4bdbcef06efd6f33c405113998c9e861c2ceffe..9a3e92332e207ab4b3c3086eaeefbe825f57aabc 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(base::KeyboardCode keycode);
+  virtual void OnKeyDown(app::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(base::VKEY_E,
+  kill_button_->AddAccelerator(views::Accelerator(app::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(base::KeyboardCode keycode) {
-  if (keycode == base::VKEY_RETURN)
+void TaskManagerView::OnKeyDown(app::KeyboardCode keycode) {
+  if (keycode == app::VKEY_RETURN)
     ActivateFocusedTab();
 }