| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/error_console/error_console_factory.h" | 5 #include "chrome/browser/extensions/install_verifier_factory.h" |
| 6 | 6 |
| 7 #include "chrome/browser/extensions/error_console/error_console.h" | 7 #include "chrome/browser/extensions/install_verifier.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 9 #include "components/keyed_service/content/browser_context_dependency_manager.h" |
| 10 #include "extensions/browser/extension_prefs.h" |
| 11 #include "extensions/browser/extension_prefs_factory.h" |
| 10 #include "extensions/browser/extension_registry_factory.h" | 12 #include "extensions/browser/extension_registry_factory.h" |
| 11 #include "extensions/browser/extensions_browser_client.h" | 13 #include "extensions/browser/extensions_browser_client.h" |
| 12 | 14 |
| 13 using content::BrowserContext; | 15 using content::BrowserContext; |
| 14 | 16 |
| 15 namespace extensions { | 17 namespace extensions { |
| 16 | 18 |
| 17 // static | 19 // static |
| 18 ErrorConsole* ErrorConsoleFactory::GetForBrowserContext( | 20 InstallVerifier* InstallVerifierFactory::GetForBrowserContext( |
| 19 BrowserContext* context) { | 21 BrowserContext* context) { |
| 20 return static_cast<ErrorConsole*>( | 22 return static_cast<InstallVerifier*>( |
| 21 GetInstance()->GetServiceForBrowserContext(context, true)); | 23 GetInstance()->GetServiceForBrowserContext(context, true)); |
| 22 } | 24 } |
| 23 | 25 |
| 24 // static | 26 // static |
| 25 ErrorConsoleFactory* ErrorConsoleFactory::GetInstance() { | 27 InstallVerifierFactory* InstallVerifierFactory::GetInstance() { |
| 26 return Singleton<ErrorConsoleFactory>::get(); | 28 return Singleton<InstallVerifierFactory>::get(); |
| 27 } | 29 } |
| 28 | 30 |
| 29 ErrorConsoleFactory::ErrorConsoleFactory() | 31 InstallVerifierFactory::InstallVerifierFactory() |
| 30 : BrowserContextKeyedServiceFactory( | 32 : BrowserContextKeyedServiceFactory( |
| 31 "ErrorConsole", | 33 "InstallVerifier", |
| 32 BrowserContextDependencyManager::GetInstance()) { | 34 BrowserContextDependencyManager::GetInstance()) { |
| 35 DependsOn(ExtensionPrefsFactory::GetInstance()); |
| 33 DependsOn(ExtensionRegistryFactory::GetInstance()); | 36 DependsOn(ExtensionRegistryFactory::GetInstance()); |
| 34 } | 37 } |
| 35 | 38 |
| 36 ErrorConsoleFactory::~ErrorConsoleFactory() { | 39 InstallVerifierFactory::~InstallVerifierFactory() { |
| 37 } | 40 } |
| 38 | 41 |
| 39 KeyedService* ErrorConsoleFactory::BuildServiceInstanceFor( | 42 KeyedService* InstallVerifierFactory::BuildServiceInstanceFor( |
| 40 BrowserContext* context) const { | 43 BrowserContext* context) const { |
| 41 return new ErrorConsole(Profile::FromBrowserContext(context)); | 44 return new InstallVerifier(ExtensionPrefs::Get(context), context); |
| 42 } | 45 } |
| 43 | 46 |
| 44 BrowserContext* ErrorConsoleFactory::GetBrowserContextToUse( | 47 BrowserContext* InstallVerifierFactory::GetBrowserContextToUse( |
| 45 BrowserContext* context) const { | 48 BrowserContext* context) const { |
| 46 // Redirected in incognito. | 49 // Redirected in incognito. |
| 47 return ExtensionsBrowserClient::Get()->GetOriginalContext(context); | 50 return ExtensionsBrowserClient::Get()->GetOriginalContext(context); |
| 48 } | 51 } |
| 49 | 52 |
| 50 } // namespace extensions | 53 } // namespace extensions |
| OLD | NEW |