The TableViewObserver::OnKeyDown method signature was changed recently and

the bookmark manager view had not been properly updated and was not called
anymore, breaking the keyboard shortcuts.
This was broken in the TaskManager as well.

Also changed the TreeView to use the base::KeyboardCode.

BUG=25533
TEST=Test that the different shortcuts (CTRL-X,CTRL-V, CTRL-C, DELETE,
     ENTER...) work in the bookmark manager.
     Test that in the TaskManager, pressing ENTER activates the selected tab.

Review URL: http://codereview.chromium.org/322006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29854 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 22 insertions, 21 deletions

diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index 959e916..fafa228 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -103,31 +103,31 @@ class ImportObserverImpl : public ImportObserver {
 
 // Converts a virtual keycode into the CutCopyPasteType.
 BookmarkManagerView::CutCopyPasteType KeyCodeToCutCopyPaste(
-    unsigned short virtual_keycode) {
-  switch (virtual_keycode) {
-    case VK_INSERT:
+    base::KeyboardCode keycode) {
+  switch (keycode) {
+    case base::VKEY_INSERT:
       if (GetKeyState(VK_CONTROL) < 0)
         return BookmarkManagerView::COPY;
       if (GetKeyState(VK_SHIFT) < 0)
         return BookmarkManagerView::PASTE;
       return BookmarkManagerView::NONE;
 
-    case VK_DELETE:
+    case base::VKEY_DELETE:
       if (GetKeyState(VK_SHIFT) < 0)
         return BookmarkManagerView::CUT;
       return BookmarkManagerView::NONE;
 
-    case 'C':
+    case base::VKEY_C:
       if (GetKeyState(VK_CONTROL) < 0)
         return BookmarkManagerView::COPY;
       return BookmarkManagerView::NONE;
 
-    case 'V':
+    case base::VKEY_V:
       if (GetKeyState(VK_CONTROL) < 0)
         return BookmarkManagerView::PASTE;
       return BookmarkManagerView::NONE;
 
-    case 'X':
+    case base::VKEY_X:
       if (GetKeyState(VK_CONTROL) < 0)
         return BookmarkManagerView::CUT;
       return BookmarkManagerView::NONE;
@@ -436,9 +436,9 @@ void BookmarkManagerView::OnTableViewDelete(views::TableView* table) {
   }
 }
 
-void BookmarkManagerView::OnKeyDown(unsigned short virtual_keycode) {
-  switch (virtual_keycode) {
-    case VK_RETURN: {
+void BookmarkManagerView::OnKeyDown(base::KeyboardCode keycode) {
+  switch (keycode) {
+    case base::VKEY_RETURN: {
       std::vector<const BookmarkNode*> selected_nodes = GetSelectedTableNodes();
       if (selected_nodes.size() == 1 && selected_nodes[0]->is_folder()) {
         SelectInTree(selected_nodes[0]);
@@ -450,7 +450,7 @@ void BookmarkManagerView::OnKeyDown(unsigned short virtual_keycode) {
       break;
     }
 
-    case VK_BACK: {
+    case base::VKEY_BACK: {
       const BookmarkNode* selected_folder = GetSelectedFolder();
       if (selected_folder != NULL &&
           selected_folder->GetParent() != GetBookmarkModel()->root_node()) {
@@ -460,7 +460,7 @@ void BookmarkManagerView::OnKeyDown(unsigned short virtual_keycode) {
     }
 
     default:
-      OnCutCopyPaste(KeyCodeToCutCopyPaste(virtual_keycode), true);
+      OnCutCopyPaste(KeyCodeToCutCopyPaste(keycode), true);
       break;
   }
 }
@@ -503,9 +503,9 @@ void BookmarkManagerView::OnTreeViewSelectionChanged(
   SetTableModel(new_table_model, table_parent_node, is_search);
 }
 
-void BookmarkManagerView::OnTreeViewKeyDown(unsigned short virtual_keycode) {
-  switch (virtual_keycode) {
-    case VK_DELETE: {
+void BookmarkManagerView::OnTreeViewKeyDown(base::KeyboardCode keycode) {
+  switch (keycode) {
+    case base::VKEY_DELETE: {
       const BookmarkNode* node = GetSelectedFolder();
       if (!node || node->GetParent() == GetBookmarkModel()->root_node())
         return;
@@ -516,7 +516,7 @@ void BookmarkManagerView::OnTreeViewKeyDown(unsigned short virtual_keycode) {
     }
 
     default:
-      OnCutCopyPaste(KeyCodeToCutCopyPaste(virtual_keycode), false);
+      OnCutCopyPaste(KeyCodeToCutCopyPaste(keycode), false);
       break;
   }
 }
diff --git a/chrome/browser/views/bookmark_manager_view.h b/chrome/browser/views/bookmark_manager_view.h
index 608b8c7..37bc746 100644
--- a/chrome/browser/views/bookmark_manager_view.h
+++ b/chrome/browser/views/bookmark_manager_view.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_VIEWS_BOOKMARK_MANAGER_VIEW_H_
 #define CHROME_BROWSER_VIEWS_BOOKMARK_MANAGER_VIEW_H_
 
+#include "base/keyboard_codes.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
@@ -112,11 +113,11 @@ class BookmarkManagerView : public views::View,
   virtual void OnDoubleClick();
   virtual void OnMiddleClick();
   virtual void OnTableViewDelete(views::TableView* table);
-  virtual void OnKeyDown(unsigned short virtual_keycode);
+  virtual void OnKeyDown(base::KeyboardCode keycode);
 
   // TreeViewController methods.
   virtual void OnTreeViewSelectionChanged(views::TreeView* tree_view);
-  virtual void OnTreeViewKeyDown(unsigned short virtual_keycode);
+  virtual void OnTreeViewKeyDown(base::KeyboardCode keycode);
 
 #if defined(BROWSER_SYNC)
   // views::ButtonListener method.
diff --git a/chrome/browser/views/task_manager_view.cc b/chrome/browser/views/task_manager_view.cc
index 47bb74c..468562e 100644
--- a/chrome/browser/views/task_manager_view.cc
+++ b/chrome/browser/views/task_manager_view.cc
@@ -215,7 +215,7 @@ class TaskManagerView : public views::View,
   // views::TableViewObserver implementation.
   virtual void OnSelectionChanged();
   virtual void OnDoubleClick();
-  virtual void OnKeyDown(unsigned short virtual_keycode);
+  virtual void OnKeyDown(base::KeyboardCode keycode);
 
   // views::LinkController implementation.
   virtual void LinkActivated(views::Link* source, int event_flags);
@@ -582,8 +582,8 @@ void TaskManagerView::OnDoubleClick() {
   ActivateFocusedTab();
 }
 
-void TaskManagerView::OnKeyDown(unsigned short virtual_keycode) {
-  if (virtual_keycode == base::VKEY_RETURN)
+void TaskManagerView::OnKeyDown(base::KeyboardCode keycode) {
+  if (keycode == base::VKEY_RETURN)
     ActivateFocusedTab();
 }