BookmarkManager keyboard shortcuts were broken

chrome/browser/views/bookmark_manager_view.cc

 // Copyright (c) 2009 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/views/bookmark_manager_view.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
@@ skipping 85 matching lines @@
   Profile* profile_;
   // Number of children in the other bookmarks folder at the time we were
   // created.
   int initial_other_count_;
 
   DISALLOW_COPY_AND_ASSIGN(ImportObserverImpl);
 };
 
 // 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;
 
     default:
       return BookmarkManagerView::NONE;
   }
 }
 
 }  // namespace
@@ skipping 288 matching lines @@
 void BookmarkManagerView::OnTableViewDelete(views::TableView* table) {
   std::vector<const BookmarkNode*> nodes = GetSelectedTableNodes();
   if (nodes.empty())
     return;
   for (size_t i = 0; i < nodes.size(); ++i) {
     GetBookmarkModel()->Remove(nodes[i]->GetParent(),
                                nodes[i]->GetParent()->IndexOfChild(nodes[i]));
   }
 }
 
-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]);
       } else {
         bookmark_utils::OpenAll(
             GetWidget()->GetNativeView(), profile_, NULL, selected_nodes,
             CURRENT_TAB);
       }
       break;
     }
 
-    case VK_BACK: {
+    case base::VKEY_BACK: {
       const BookmarkNode* selected_folder = GetSelectedFolder();
       if (selected_folder != NULL &&
           selected_folder->GetParent() != GetBookmarkModel()->root_node()) {
         SelectInTree(selected_folder->GetParent());
       }
       break;
     }
 
     default:
-      OnCutCopyPaste(KeyCodeToCutCopyPaste(virtual_keycode), true);
+      OnCutCopyPaste(KeyCodeToCutCopyPaste(keycode), true);
       break;
   }
 }
 
 void BookmarkManagerView::OnTreeViewSelectionChanged(
     views::TreeView* tree_view) {
   TreeModelNode* node = tree_view_->GetSelectedNode();
 
   BookmarkTableModel* new_table_model = NULL;
   const BookmarkNode* table_parent_node = NULL;
@@ skipping 22 matching lines @@
 
       default:
         NOTREACHED();
         break;
     }
   }
 
   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;
 
       const BookmarkNode* parent = node->GetParent();
       GetBookmarkModel()->Remove(parent, parent->IndexOfChild(node));
       break;
     }
 
     default:
-      OnCutCopyPaste(KeyCodeToCutCopyPaste(virtual_keycode), false);
+      OnCutCopyPaste(KeyCodeToCutCopyPaste(keycode), false);
       break;
   }
 }
 
 #if defined(BROWSER_SYNC)
 void BookmarkManagerView::ButtonPressed(views::Button* sender,
                                         const views::Event& event) {
   if (sender == sync_status_button_) {
     UserMetrics::RecordAction(L"BookmarkManager_Sync", profile_);
     OpenSyncMyBookmarksDialog();
@@ skipping 326 matching lines @@
     return;
   if (sync_service_->HasSyncSetupCompleted()) {
     ShowOptionsWindow(OPTIONS_PAGE_CONTENT, OPTIONS_GROUP_NONE, profile_);
   } else {
     sync_service_->EnableForUser();
     ProfileSyncService::SyncEvent(
         ProfileSyncService::START_FROM_BOOKMARK_MANAGER);
   }
 }
 #endif  // defined(BROWSER_SYNC)