| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "apps/shell/browser/shell_extensions_browser_client.h" | 5 #include "apps/shell/browser/shell_extensions_browser_client.h" |
| 6 | 6 |
| 7 #include "apps/shell/browser/shell_app_sorting.h" | 7 #include "apps/shell/browser/shell_app_sorting.h" |
| 8 #include "apps/shell/browser/shell_extension_system.h" | 8 #include "apps/shell/browser/shell_extension_system_factory.h" |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "base/prefs/pref_service_factory.h" | 10 #include "base/prefs/pref_service_factory.h" |
| 11 #include "base/prefs/testing_pref_store.h" | 11 #include "base/prefs/testing_pref_store.h" |
| 12 #include "components/user_prefs/pref_registry_syncable.h" | 12 #include "components/user_prefs/pref_registry_syncable.h" |
| 13 #include "components/user_prefs/user_prefs.h" | 13 #include "components/user_prefs/user_prefs.h" |
| 14 #include "extensions/browser/app_sorting.h" | 14 #include "extensions/browser/app_sorting.h" |
| 15 #include "extensions/browser/extension_prefs.h" | 15 #include "extensions/browser/extension_prefs.h" |
| 16 | 16 |
| 17 using content::BrowserContext; | 17 using content::BrowserContext; |
| 18 | 18 |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 NOTREACHED(); | 139 NOTREACHED(); |
| 140 return NULL; | 140 return NULL; |
| 141 } | 141 } |
| 142 | 142 |
| 143 ApiActivityMonitor* ShellExtensionsBrowserClient::GetApiActivityMonitor( | 143 ApiActivityMonitor* ShellExtensionsBrowserClient::GetApiActivityMonitor( |
| 144 BrowserContext* context) { | 144 BrowserContext* context) { |
| 145 // app_shell doesn't monitor API function calls or events. | 145 // app_shell doesn't monitor API function calls or events. |
| 146 return NULL; | 146 return NULL; |
| 147 } | 147 } |
| 148 | 148 |
| 149 std::vector<BrowserContextKeyedServiceFactory*> | 149 ExtensionSystemProvider* |
| 150 ShellExtensionsBrowserClient::GetExtensionSystemDependencies() { | 150 ShellExtensionsBrowserClient::GetExtensionSystemFactory() { |
| 151 return ShellExtensionSystem::GetDependencies(); | 151 return ShellExtensionSystemFactory::GetInstance(); |
| 152 } | |
| 153 | |
| 154 ExtensionSystem* ShellExtensionsBrowserClient::CreateExtensionSystem( | |
| 155 BrowserContext* context) { | |
| 156 return new ShellExtensionSystem(context); | |
| 157 } | 152 } |
| 158 | 153 |
| 159 } // namespace extensions | 154 } // namespace extensions |
| OLD | NEW |