Refactor GlobalShortcutListener.

chrome/browser/extensions/extension_commands_global_registry.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/extensions/extension_commands_global_registry.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
@@ skipping 60 matching lines @@
   for (; iter != commands.end(); ++iter) {
     if (!command_name.empty() && (iter->second.command_name() != command_name))
       continue;
 
     VLOG(0) << "Adding global keybinding for " << extension->name().c_str()
             << " " << command_name.c_str()
             << " key: " << iter->second.accelerator().GetShortcutText();
 
     event_targets_[iter->second.accelerator()].push_back(
         std::make_pair(extension->id(), iter->second.command_name()));
-    // Shortcuts except media keys have only one target in the list. See comment
-    // about |event_targets_|.
-    if (!extensions::CommandService::IsMediaKey(iter->second.accelerator()))
+    if (!extensions::CommandService::IsMediaKey(iter->second.accelerator())) {
+      // Shortcuts except media keys have only one target in the list. See
+      // comment about |event_targets_|.
       DCHECK(event_targets_[iter->second.accelerator()].size() == 1);
+    } else if (event_targets_[iter->second.accelerator()].size() > 1) {
+      // Now the |iter->second.accelerator()| is one of the media keys, we have
+      // registerd it successfully, so pass it by.
+      continue;
+    }
 
-    GlobalShortcutListener::GetInstance()->RegisterAccelerator(
-      iter->second.accelerator(), this);
+    if (!GlobalShortcutListener::GetInstance()->RegisterAccelerator(
+            iter->second.accelerator(), this))

[zhchbin, 2013/12/17 13:34:32]

You may ask why I didn't call RegisterAccelerator early, before the |push_back|.
Think about multiply media keys.

[Finnur, 2013/12/17 14:31:40]

Wondering if this would be simpler (you'll need to remove lines 79-80) (and this
is pseudo, haven't compiled it)...

size_t target_count =
    event_targets_.find(iter->second.accelerator()) != event_targets_.end() ?
        event_targets_[iter->second.accelerator()].size() : 0;

if (extensions::CommandService::IsMediaKey(iter->second.accelerator()) &&
    target_count > 0U)
  continue;  // Shortcut listener already listening for this media key.
}

DCHECK_EQ(0U, target_count);
if (GlobalShortcutListener::GetInstance()->RegisterAccelerator(
    iter->second.accelerator(), this)) {
  event_targets_[iter->second.accelerator()].push_back(
      std::make_pair(extension->id(), iter->second.command_name()));
}

[zhchbin, 2013/12/17 15:15:46]

Thanks very much!

In this case we should also push a pair (extension id, command name) to the
event_targets. Otherwise the test case
"GlobalCommandsApiTest.GlobalDuplicatedMediaKey" will fail. 

Done with also adding a pair.

+      event_targets_.erase(iter->second.accelerator());
   }
 }
 
 void ExtensionCommandsGlobalRegistry::RemoveExtensionKeybindingImpl(
     const ui::Accelerator& accelerator,
     const std::string& command_name) {
   VLOG(0) << "Removing keybinding for " << command_name.c_str();
 
   GlobalShortcutListener::GetInstance()->UnregisterAccelerator(
       accelerator, this);
 }
 
 void ExtensionCommandsGlobalRegistry::OnKeyPressed(
     const ui::Accelerator& accelerator) {
   ExtensionKeybindingRegistry::NotifyEventTargets(accelerator);
 }
 
 }  // namespace extensions