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

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

Issue 698553002: Split Blacklist from ExtensionSystem. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 6 years, 1 month 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/blacklist_factory.h"
7 #include "chrome/browser/extensions/extension_management.h" 8 #include "chrome/browser/extensions/extension_management.h"
8 #include "chrome/browser/policy/profile_policy_connector_factory.h" 9 #include "chrome/browser/policy/profile_policy_connector_factory.h"
9 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 11 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
11 #include "components/keyed_service/content/browser_context_dependency_manager.h" 12 #include "components/keyed_service/content/browser_context_dependency_manager.h"
12 #include "extensions/browser/extension_prefs_factory.h" 13 #include "extensions/browser/extension_prefs_factory.h"
13 #include "extensions/browser/extension_registry_factory.h" 14 #include "extensions/browser/extension_registry_factory.h"
14 #include "extensions/browser/extension_system.h" 15 #include "extensions/browser/extension_system.h"
15 #include "extensions/browser/extensions_browser_client.h" 16 #include "extensions/browser/extensions_browser_client.h"
16 #include "extensions/browser/process_manager_factory.h" 17 #include "extensions/browser/process_manager_factory.h"
(...skipping 21 matching lines...) Expand all
38 "ExtensionSystemShared", 39 "ExtensionSystemShared",
39 BrowserContextDependencyManager::GetInstance()) { 40 BrowserContextDependencyManager::GetInstance()) {
40 DependsOn(ExtensionPrefsFactory::GetInstance()); 41 DependsOn(ExtensionPrefsFactory::GetInstance());
41 DependsOn(ExtensionManagementFactory::GetInstance()); 42 DependsOn(ExtensionManagementFactory::GetInstance());
42 // This depends on ExtensionService which depends on ExtensionRegistry. 43 // This depends on ExtensionService which depends on ExtensionRegistry.
43 DependsOn(ExtensionRegistryFactory::GetInstance()); 44 DependsOn(ExtensionRegistryFactory::GetInstance());
44 DependsOn(GlobalErrorServiceFactory::GetInstance()); 45 DependsOn(GlobalErrorServiceFactory::GetInstance());
45 DependsOn(policy::ProfilePolicyConnectorFactory::GetInstance()); 46 DependsOn(policy::ProfilePolicyConnectorFactory::GetInstance());
46 DependsOn(ProcessManagerFactory::GetInstance()); 47 DependsOn(ProcessManagerFactory::GetInstance());
47 DependsOn(RendererStartupHelperFactory::GetInstance()); 48 DependsOn(RendererStartupHelperFactory::GetInstance());
49 DependsOn(BlacklistFactory::GetInstance());
48 } 50 }
49 51
50 ExtensionSystemSharedFactory::~ExtensionSystemSharedFactory() { 52 ExtensionSystemSharedFactory::~ExtensionSystemSharedFactory() {
51 } 53 }
52 54
53 KeyedService* ExtensionSystemSharedFactory::BuildServiceInstanceFor( 55 KeyedService* ExtensionSystemSharedFactory::BuildServiceInstanceFor(
54 content::BrowserContext* context) const { 56 content::BrowserContext* context) const {
55 return new ExtensionSystemImpl::Shared(static_cast<Profile*>(context)); 57 return new ExtensionSystemImpl::Shared(static_cast<Profile*>(context));
56 } 58 }
57 59
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 content::BrowserContext* context) const { 97 content::BrowserContext* context) const {
96 // Separate instance in incognito. 98 // Separate instance in incognito.
97 return context; 99 return context;
98 } 100 }
99 101
100 bool ExtensionSystemFactory::ServiceIsCreatedWithBrowserContext() const { 102 bool ExtensionSystemFactory::ServiceIsCreatedWithBrowserContext() const {
101 return true; 103 return true;
102 } 104 }
103 105
104 } // namespace extensions 106 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_install_checker.cc ('k') | chrome/browser/extensions/extension_system_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698