Landing Hamaji accelerator clean-up patch

chrome/browser/task_manager.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/task_manager.h"
 
 #include "base/process_util.h"
 #include "base/stats_table.h"
 #include "base/string_util.h"
 #include "base/thread.h"
@@ skipping 766 matching lines @@
   UpdateStatsCounters();
   views::TableColumn col(kGoatsTeleportedColumn, L"Goats Teleported",
                          views::TableColumn::RIGHT, -1, 0);
   col.sortable = true;
   columns_.push_back(col);
   tab_table_->AddColumn(col);
   tab_table_->SetObserver(this);
   SetContextMenuController(this);
   kill_button_.reset(new views::NativeButton(
       this, l10n_util::GetString(IDS_TASK_MANAGER_KILL)));
-  // TODO(hamaji): Use accelerator once the bug in FocusManager fixed.
-  //               http://crbug.com/11073
-  // kill_button_->AddAccelerator(views::Accelerator('E', false, false, false));
+  kill_button_->AddAccelerator(views::Accelerator('E', false, false, false));
   kill_button_->SetAccessibleKeyboardShortcut(L"E");
   about_memory_link_.reset(new views::Link(
       l10n_util::GetString(IDS_TASK_MANAGER_ABOUT_MEMORY_LINK)));
   about_memory_link_->SetController(this);
 
   AddChildView(tab_table_);
 
   // Makes sure our state is consistent.
   OnSelectionChanged();
 }
@@ skipping 113 matching lines @@
                            tab_table_->SelectedRowCount() > 0);
 }
 
 void TaskManagerContents::OnDoubleClick() {
   task_manager_->ActivateFocusedTab();
 }
 
 void TaskManagerContents::OnKeyDown(unsigned short virtual_keycode) {
   if (virtual_keycode == VK_RETURN)
     task_manager_->ActivateFocusedTab();
-  else if (virtual_keycode == 'E')
-    task_manager_->KillSelectedProcesses();
 }
 
 // views::LinkController implementation
 void TaskManagerContents::LinkActivated(views::Link* source,
                                         int event_flags) {
   DCHECK(source == about_memory_link_);
   Browser* browser = BrowserList::GetLastActive();
   DCHECK(browser);
   browser->OpenURL(GURL("about:memory"), GURL(), NEW_FOREGROUND_TAB,
                    PageTransition::LINK);
@@ skipping 172 matching lines @@
 }
 
 views::View* TaskManager::GetContentsView() {
   return contents_.get();
 }
 
 // static
 TaskManager* TaskManager::GetInstance() {
   return Singleton<TaskManager>::get();
 }