Allow extensions to remove and override the bookmark shortcut key

chrome/browser/ui/views/accelerator_utils_aura.cc

 // Copyright (c) 2013 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/profiles/profile.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/views/accelerator_table.h"
 #include "ui/base/accelerators/accelerator.h"
 
 #if defined(USE_ASH)
 #include "ash/accelerators/accelerator_table.h"
 #endif  // USE_ASH
 
 namespace chrome {
 
 bool IsChromeAccelerator(const ui::Accelerator& accelerator, Profile* profile) {
@@ skipping 12 matching lines @@
   for (std::vector<chrome::AcceleratorMapping>::const_iterator it =
        accelerators.begin(); it != accelerators.end(); ++it) {
     if (it->keycode == accelerator.key_code() &&
         it->modifiers == accelerator.modifiers())
       return true;
   }
 
   return false;
 }
 
+ui::Accelerator GetPrimaryChromeAcceleratorForCommandId(int command_id) {
+  ui::Accelerator accelerator;
+  if (GetStandardAcceleratorForCommandId(command_id, &accelerator))

[sky, 2014/02/06 16:03:16]

nit: I would likely combine this if and 43.

+    return accelerator;
+  if (GetAshAcceleratorForCommandId(command_id,
+                                    chrome::GetActiveDesktop(),

[sky, 2014/02/06 16:03:16]

Using activedesktop like this is a bit dicey. Is there no way to pass in the
hostdesktop?

[Mike Wittman, 2014/02/06 19:35:42]

This is invoked from the extension command service, which operates independent
of any particular browser as far as I can tell.

Taking a step back, this function probably should identify Ash accelerators if
it's possible to have an Ash desktop on the platform, independent of whether the
Ash desktop is currently in use. I'll update accordingly.

A side node: on Windows the Ash accelerators are duplicated in the general
kAcceleratorMap table, so this function would produce the same results
regardless of how (or if) GetAshAcceleratorForCommandId is invoked. On ChromeOS
it is necessary to pick up those accelerators via GetAshAcceleratorForCommandId.

+                                    &accelerator)) {
+    return accelerator;
+  }
+
+  std::vector<chrome::AcceleratorMapping> accelerators =
+      chrome::GetAcceleratorList();
+  for (size_t i = 0; i < accelerators.size(); ++i) {
+    if (accelerators[i].command_id == command_id) {
+      return ui::Accelerator(accelerators[i].keycode,
+                             accelerators[i].modifiers);
+    }
+  }
+
+  return ui::Accelerator();
+}
+
 }  // namespace chrome