| 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/common/api/generated_api.h" |
| 7 #include "apps/shell/browser/shell_app_sorting.h" | 8 #include "apps/shell/browser/shell_app_sorting.h" |
| 8 #include "apps/shell/browser/shell_extension_system_factory.h" | 9 #include "apps/shell/browser/shell_extension_system_factory.h" |
| 9 #include "apps/shell/browser/shell_extension_web_contents_observer.h" | 10 #include "apps/shell/browser/shell_extension_web_contents_observer.h" |
| 10 #include "base/prefs/pref_service.h" | 11 #include "base/prefs/pref_service.h" |
| 11 #include "base/prefs/pref_service_factory.h" | 12 #include "base/prefs/pref_service_factory.h" |
| 12 #include "base/prefs/testing_pref_store.h" | 13 #include "base/prefs/testing_pref_store.h" |
| 13 #include "chrome/common/extensions/api/generated_api.h" | 14 #include "chrome/common/extensions/api/generated_api.h" |
| 14 #include "components/user_prefs/pref_registry_syncable.h" | 15 #include "components/user_prefs/pref_registry_syncable.h" |
| 15 #include "components/user_prefs/user_prefs.h" | 16 #include "components/user_prefs/user_prefs.h" |
| 16 #include "extensions/browser/api/extensions_api_client.h" | 17 #include "extensions/browser/api/extensions_api_client.h" |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 return NULL; | 191 return NULL; |
| 191 } | 192 } |
| 192 | 193 |
| 193 ExtensionSystemProvider* | 194 ExtensionSystemProvider* |
| 194 ShellExtensionsBrowserClient::GetExtensionSystemFactory() { | 195 ShellExtensionsBrowserClient::GetExtensionSystemFactory() { |
| 195 return ShellExtensionSystemFactory::GetInstance(); | 196 return ShellExtensionSystemFactory::GetInstance(); |
| 196 } | 197 } |
| 197 | 198 |
| 198 void ShellExtensionsBrowserClient::RegisterExtensionFunctions( | 199 void ShellExtensionsBrowserClient::RegisterExtensionFunctions( |
| 199 ExtensionFunctionRegistry* registry) const { | 200 ExtensionFunctionRegistry* registry) const { |
| 201 // Generated APIs from lower-level modules. |
| 200 extensions::core_api::GeneratedFunctionRegistry::RegisterAll(registry); | 202 extensions::core_api::GeneratedFunctionRegistry::RegisterAll(registry); |
| 203 apps::api::GeneratedFunctionRegistry::RegisterAll(registry); |
| 204 |
| 201 // TODO(rockot): Remove dependency on src/chrome once we have some core APIs | 205 // TODO(rockot): Remove dependency on src/chrome once we have some core APIs |
| 202 // moved out. See http://crbug.com/349042. | 206 // moved out. See http://crbug.com/349042. |
| 203 extensions::api::GeneratedFunctionRegistry::RegisterAll(registry); | 207 extensions::api::GeneratedFunctionRegistry::RegisterAll(registry); |
| 204 } | 208 } |
| 205 | 209 |
| 206 } // namespace extensions | 210 } // namespace extensions |
| OLD | NEW |