Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6405)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/extension_system_factory.cc

Issue 10201016: Conflict detection for Extension Keybinding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/extensions/extension_command_service_factory.cc ('K') | « chrome/browser/extensions/extension_keybinding_apitest.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | chrome/browser/profiles/profile_dependency_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_system_factory.cc
===================================================================
--- chrome/browser/extensions/extension_system_factory.cc (revision 134258)
+++ chrome/browser/extensions/extension_system_factory.cc (working copy)
@@ -4,6 +4,7 @@
#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"
@@ -32,6 +33,7 @@
: 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
Yoyo Zhou 2012/05/01 01:51:30 Indeed (and you want to depend on ExtensionSystemF
Finnur 2012/05/02 13:50:45 Done.
DependsOn(GlobalErrorServiceFactory::GetInstance());
DependsOn(TemplateURLServiceFactory::GetInstance());
DependsOn(ThemeServiceFactory::GetInstance());
« chrome/browser/extensions/extension_command_service_factory.cc ('K') | « chrome/browser/extensions/extension_keybinding_apitest.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | chrome/browser/profiles/profile_dependency_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698