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

Side by Side Diff: chrome/browser/extensions/extension_system_factory.cc

Issue 500043003: Add PolicyProvider to ExtensionManagement (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ext-1
Patch Set: fixes to #3 Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/extension_system_factory.h" 5 #include "chrome/browser/extensions/extension_system_factory.h"
6 6
7 #include "chrome/browser/extensions/extension_management.h"
7 #include "chrome/browser/policy/profile_policy_connector_factory.h" 8 #include "chrome/browser/policy/profile_policy_connector_factory.h"
8 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 10 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
10 #include "components/keyed_service/content/browser_context_dependency_manager.h" 11 #include "components/keyed_service/content/browser_context_dependency_manager.h"
11 #include "extensions/browser/extension_prefs_factory.h" 12 #include "extensions/browser/extension_prefs_factory.h"
12 #include "extensions/browser/extension_registry_factory.h" 13 #include "extensions/browser/extension_registry_factory.h"
13 #include "extensions/browser/extension_system.h" 14 #include "extensions/browser/extension_system.h"
14 #include "extensions/browser/extensions_browser_client.h" 15 #include "extensions/browser/extensions_browser_client.h"
15 #include "extensions/browser/renderer_startup_helper.h" 16 #include "extensions/browser/renderer_startup_helper.h"
16 17
(...skipping 12 matching lines...) Expand all
29 // static 30 // static
30 ExtensionSystemSharedFactory* ExtensionSystemSharedFactory::GetInstance() { 31 ExtensionSystemSharedFactory* ExtensionSystemSharedFactory::GetInstance() {
31 return Singleton<ExtensionSystemSharedFactory>::get(); 32 return Singleton<ExtensionSystemSharedFactory>::get();
32 } 33 }
33 34
34 ExtensionSystemSharedFactory::ExtensionSystemSharedFactory() 35 ExtensionSystemSharedFactory::ExtensionSystemSharedFactory()
35 : BrowserContextKeyedServiceFactory( 36 : BrowserContextKeyedServiceFactory(
36 "ExtensionSystemShared", 37 "ExtensionSystemShared",
37 BrowserContextDependencyManager::GetInstance()) { 38 BrowserContextDependencyManager::GetInstance()) {
38 DependsOn(ExtensionPrefsFactory::GetInstance()); 39 DependsOn(ExtensionPrefsFactory::GetInstance());
40 DependsOn(ExtensionManagementFactory::GetInstance());
39 // This depends on ExtensionService which depends on ExtensionRegistry. 41 // This depends on ExtensionService which depends on ExtensionRegistry.
40 DependsOn(ExtensionRegistryFactory::GetInstance()); 42 DependsOn(ExtensionRegistryFactory::GetInstance());
41 DependsOn(GlobalErrorServiceFactory::GetInstance()); 43 DependsOn(GlobalErrorServiceFactory::GetInstance());
42 DependsOn(policy::ProfilePolicyConnectorFactory::GetInstance()); 44 DependsOn(policy::ProfilePolicyConnectorFactory::GetInstance());
43 DependsOn(RendererStartupHelperFactory::GetInstance()); 45 DependsOn(RendererStartupHelperFactory::GetInstance());
44 } 46 }
45 47
46 ExtensionSystemSharedFactory::~ExtensionSystemSharedFactory() { 48 ExtensionSystemSharedFactory::~ExtensionSystemSharedFactory() {
47 } 49 }
48 50
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 content::BrowserContext* context) const { 93 content::BrowserContext* context) const {
92 // Separate instance in incognito. 94 // Separate instance in incognito.
93 return context; 95 return context;
94 } 96 }
95 97
96 bool ExtensionSystemFactory::ServiceIsCreatedWithBrowserContext() const { 98 bool ExtensionSystemFactory::ServiceIsCreatedWithBrowserContext() const {
97 return true; 99 return true;
98 } 100 }
99 101
100 } // namespace extensions 102 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698