Conflict detection for Extension Keybinding.

chrome/browser/profiles/profile_dependency_manager.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/profiles/profile_dependency_manager.h"
 
 #include <algorithm>
 #include <deque>
 #include <iterator>
 
 #include "chrome/browser/autocomplete/network_action_predictor_factory.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/download/download_service_factory.h"
+#include "chrome/browser/extensions/extension_command_service_factory.h"
 #include "chrome/browser/intents/web_intents_registry_factory.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/plugin_prefs_factory.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
 #include "chrome/browser/protector/protector_service_factory.h"
@@ skipping 142 matching lines @@
 //
 // TODO(erg): This needs to be something else. I don't think putting every
 // FooServiceFactory here will scale or is desireable long term.
 void ProfileDependencyManager::AssertFactoriesBuilt() {
   if (built_factories_)
     return;
 
   ChromeURLDataManagerFactory::GetInstance();
   CookieSettings::Factory::GetInstance();
   DownloadServiceFactory::GetInstance();
+  ExtensionCommandServiceFactory::GetInstance();

[Yoyo Zhou, 2012/05/01 01:52:49]

Comment for erg:
I realize that I never added ExtensionSystemFactory here. Should it be here?

If so, finnur, do you mind adding it?

[Elliot Glaysher, 2012/05/01 17:42:50]

Yes, it should be here for registration purposes.

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

Done.

   FindBarStateFactory::GetInstance();
 #if defined(USE_AURA)
   GesturePrefsObserverFactoryAura::GetInstance();
 #endif
   GlobalErrorServiceFactory::GetInstance();
   NetworkActionPredictorFactory::GetInstance();
   NTPResourceCacheFactory::GetInstance();
   PasswordStoreFactory::GetInstance();
   PersonalDataManagerFactory::GetInstance();
   PluginPrefsFactory::GetInstance();
@@ skipping 138 matching lines @@
   }
 
   result.append("\n  /* Toplevel profile */\n");
   result.append("  Profile [shape=box];\n");
 
   result.append("}\n");
   return result;
 }
 
 #endif