Implement first part of supporting global extension commands.

chrome/browser/extensions/api/commands/command_service.cc

 // Copyright (c) 2012 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/api/commands/command_service.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/commands/commands.h"
+#include "chrome/browser/extensions/extension_commands_global_registry.h"
 #include "chrome/browser/extensions/extension_function_registry.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/accelerator_utils.h"
 #include "chrome/common/extensions/api/commands/commands_handler.h"
 #include "chrome/common/pref_names.h"
 #include "components/user_prefs/pref_registry_syncable.h"
@@ skipping 45 matching lines @@
   registry->RegisterDictionaryPref(
       prefs::kExtensionCommands,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
 CommandService::CommandService(Profile* profile)
     : profile_(profile) {
   ExtensionFunctionRegistry::GetInstance()->
       RegisterFunction<GetAllCommandsFunction>();
 
+  ExtensionCommandsGlobalRegistry::GetFactoryInstance()->GetForProfile(profile);
+
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALLED,
       content::Source<Profile>(profile));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
       content::Source<Profile>(profile));
 }
 
 CommandService::~CommandService() {
 }
 
 static base::LazyInstance<ProfileKeyedAPIFactory<CommandService> >
@@ skipping 31 matching lines @@
     const std::string& extension_id,
     QueryType type,
     extensions::Command* command,
     bool* active) {
   return GetExtensionActionCommand(
       extension_id, type, command, active, SCRIPT_BADGE);
 }
 
 bool CommandService::GetNamedCommands(const std::string& extension_id,
                                       QueryType type,
+                                      CommandScope scope,
                                       extensions::CommandMap* command_map) {
   const ExtensionSet* extensions =
       ExtensionSystem::Get(profile_)->extension_service()->extensions();

[zhchbin, 2013/09/28 03:33:10]

Because we add
"ExtensionCommandsGlobalRegistry::GetFactoryInstance()->GetForProfile(profile);"
in the CommandService, now we are observing NOTIFICATION_EXTENSION_LOADED, so
this function will be called when running test case:
UserScriptListenerTest.MultiProfile. And extension_service will be NULL during
testing, See
http://build.chromium.org/p/tryserver.chromium/builders/linux_asan/builds/483...
for more info.

   const Extension* extension = extensions->GetByID(extension_id);
   CHECK(extension);
 
   command_map->clear();
   const extensions::CommandMap* commands =
       CommandsInfo::GetNamedCommands(extension);
   if (!commands)
     return false;
 
   extensions::CommandMap::const_iterator iter = commands->begin();
   for (; iter != commands->end(); ++iter) {
     ui::Accelerator shortcut_assigned =
         FindShortcutForCommand(extension_id, iter->second.command_name());
 
     if (type == ACTIVE_ONLY && shortcut_assigned.key_code() == ui::VKEY_UNKNOWN)
       continue;
 
     extensions::Command command = iter->second;
+    if (scope != ANY_SCOPE && ((scope == GLOBAL) != command.global()))
+      continue;
+
     if (shortcut_assigned.key_code() != ui::VKEY_UNKNOWN)
       command.set_accelerator(shortcut_assigned);
 
     (*command_map)[iter->second.command_name()] = command;
   }
 
   return true;
 }
 
 bool CommandService::AddKeybindingPref(
@@ skipping 239 matching lines @@
     return false;
 
   *command = *requested_command;
   if (shortcut_assigned.key_code() != ui::VKEY_UNKNOWN)
     command->set_accelerator(shortcut_assigned);
 
   return true;
 }
 
 }  // namespace extensions