[Mac] Give the Wrench menu keyboard shortcuts.

chrome/browser/cocoa/toolbar_controller.mm

 // Copyright (c) 2010 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.
 
 #import "chrome/browser/cocoa/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "app/l10n_util_mac.h"
+#include "app/menus/accelerator_cocoa.h"
+#include "base/keyboard_codes.h"
 #include "base/mac_util.h"
 #include "base/nsimage_cache_mac.h"
+#include "base/singleton.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
+#import "chrome/browser/cocoa/accelerators_cocoa.h"
 #import "chrome/browser/cocoa/autocomplete_text_field.h"
 #import "chrome/browser/cocoa/autocomplete_text_field_editor.h"
 #import "chrome/browser/cocoa/back_forward_menu_controller.h"
 #import "chrome/browser/cocoa/background_gradient_view.h"
 #import "chrome/browser/cocoa/encoding_menu_controller_delegate_mac.h"
 #import "chrome/browser/cocoa/extensions/browser_action_button.h"
 #import "chrome/browser/cocoa/extensions/browser_actions_container_view.h"
 #import "chrome/browser/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/cocoa/gradient_button_cell.h"
 #import "chrome/browser/cocoa/location_bar_view_mac.h"
@@ skipping 68 matching lines @@
   virtual bool IsCommandIdChecked(int command_id) const {
     if (command_id == IDC_SHOW_BOOKMARK_BAR) {
       return browser_->profile()->GetPrefs()->GetBoolean(
           prefs::kShowBookmarkBar);
     }
     return false;
   }
   virtual bool IsCommandIdEnabled(int command_id) const {
     return browser_->command_updater()->IsCommandEnabled(command_id);
   }
-  virtual bool GetAcceleratorForCommandId(
-      int command_id,
-      menus::Accelerator* accelerator) { return false; }
+  virtual bool GetAcceleratorForCommandId(int command_id,
+      menus::Accelerator* accelerator_generic) {
+    // Downcast so that when the copy constructor is invoked below, the key
+    // string gets copied, too.
+    menus::AcceleratorCocoa* out_accelerator =
+        static_cast<menus::AcceleratorCocoa*>(accelerator_generic);
+    AcceleratorsCocoa* keymap = Singleton<AcceleratorsCocoa>::get();
+    const menus::AcceleratorCocoa* accelerator =
+        keymap->GetAcceleratorForCommand(command_id);
+    if (accelerator) {
+      *out_accelerator = *accelerator;
+      return true;
+    }
+    return false;
+  }
   virtual void ExecuteCommand(int command_id) {
     browser_->ExecuteCommand(command_id);
   }
   virtual bool IsLabelForCommandIdDynamic(int command_id) const {
     // On Mac, switch between "Enter Full Screen" and "Exit Full Screen".
     return (command_id == IDC_FULLSCREEN);
   }
   virtual string16 GetLabelForCommandId(int command_id) const {
     if (command_id == IDC_FULLSCREEN) {
       int string_id = IDS_ENTER_FULLSCREEN_MAC;  // Default to Enter.
@@ skipping 620 matching lines @@
 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 @end