Conflict detection for Extension Keybinding.

chrome/browser/extensions/extension_system_factory.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/extension_system_factory.h"
 
+#include "chrome/browser/extensions/extension_command_service_factory.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/global_error_service_factory.h"
 
 // ExtensionSystemSharedFactory
 
 // static
 ExtensionSystemImpl::Shared* ExtensionSystemSharedFactory::GetForProfile(
     Profile* profile) {
   return static_cast<ExtensionSystemImpl::Shared*>(
       GetInstance()->GetServiceForProfile(profile, true));
 }
 
 // static
 ExtensionSystemSharedFactory* ExtensionSystemSharedFactory::GetInstance() {
   return Singleton<ExtensionSystemSharedFactory>::get();
 }
 
 ExtensionSystemSharedFactory::ExtensionSystemSharedFactory()
     : ProfileKeyedServiceFactory(
         "ExtensionSystemShared",
         ProfileDependencyManager::GetInstance()) {
+  DependsOn(ExtensionCommandServiceFactory::GetInstance());

[Aaron Boodman, 2012/04/30 17:48:12]

This doesn't seem right. You want it the other way 'round. CommandServiceFactory
should depend on ExtensionSystem.

[Yoyo Zhou, 2012/05/01 01:51:30]

Indeed (and you want to depend on ExtensionSystemFactory rather than
ExtensionSystemSharedFactory, I think).

[Finnur, 2012/05/02 13:50:45]

Done.

   DependsOn(GlobalErrorServiceFactory::GetInstance());
   DependsOn(TemplateURLServiceFactory::GetInstance());
   DependsOn(ThemeServiceFactory::GetInstance());
 }
 
 ExtensionSystemSharedFactory::~ExtensionSystemSharedFactory() {
 }
 
 ProfileKeyedService* ExtensionSystemSharedFactory::BuildServiceInstanceFor(
     Profile* profile) const {
@@ skipping 32 matching lines @@
   return new ExtensionSystemImpl(profile);
 }
 
 bool ExtensionSystemFactory::ServiceHasOwnInstanceInIncognito() {
   return true;
 }
 
 bool ExtensionSystemFactory::ServiceIsCreatedWithProfile() {
   return true;
 }