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

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

Issue 334053003: Moves extension_icon_image and image_loader to extensions/browser (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revive component_extension_resource_manager Created 6 years, 6 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 | Annotate | Revision Log
OLDNEW
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 "chrome/browser/extensions/chrome_extensions_browser_client.h" 5 #include "chrome/browser/extensions/chrome_extensions_browser_client.h"
6 6
7 #include "apps/common/api/generated_api.h" 7 #include "apps/common/api/generated_api.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/path_service.h"
9 #include "base/version.h" 10 #include "base/version.h"
10 #include "chrome/browser/app_mode/app_mode_utils.h" 11 #include "chrome/browser/app_mode/app_mode_utils.h"
11 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/extensions/activity_log/activity_log.h" 13 #include "chrome/browser/extensions/activity_log/activity_log.h"
13 #include "chrome/browser/extensions/api/preference/chrome_direct_setting.h" 14 #include "chrome/browser/extensions/api/preference/chrome_direct_setting.h"
14 #include "chrome/browser/extensions/api/preference/preference_api.h" 15 #include "chrome/browser/extensions/api/preference/preference_api.h"
15 #include "chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.h" 16 #include "chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.h"
16 #include "chrome/browser/extensions/api/web_request/web_request_api.h" 17 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
17 #include "chrome/browser/extensions/chrome_app_sorting.h" 18 #include "chrome/browser/extensions/chrome_app_sorting.h"
19 #include "chrome/browser/extensions/chrome_component_extension_resource_manager. h"
18 #include "chrome/browser/extensions/chrome_extension_host_delegate.h" 20 #include "chrome/browser/extensions/chrome_extension_host_delegate.h"
19 #include "chrome/browser/extensions/extension_system_factory.h" 21 #include "chrome/browser/extensions/extension_system_factory.h"
20 #include "chrome/browser/extensions/extension_util.h" 22 #include "chrome/browser/extensions/extension_util.h"
21 #include "chrome/browser/extensions/url_request_util.h" 23 #include "chrome/browser/extensions/url_request_util.h"
22 #include "chrome/browser/external_protocol/external_protocol_handler.h" 24 #include "chrome/browser/external_protocol/external_protocol_handler.h"
23 #include "chrome/browser/profiles/profile.h" 25 #include "chrome/browser/profiles/profile.h"
24 #include "chrome/browser/profiles/profile_manager.h" 26 #include "chrome/browser/profiles/profile_manager.h"
25 #include "chrome/browser/ui/browser_finder.h" 27 #include "chrome/browser/ui/browser_finder.h"
28 #include "chrome/common/chrome_paths.h"
26 #include "chrome/common/chrome_switches.h" 29 #include "chrome/common/chrome_switches.h"
27 #include "chrome/common/chrome_version_info.h" 30 #include "chrome/common/chrome_version_info.h"
28 #include "chrome/common/extensions/api/generated_api.h" 31 #include "chrome/common/extensions/api/generated_api.h"
29 #include "chrome/common/extensions/features/feature_channel.h" 32 #include "chrome/common/extensions/features/feature_channel.h"
30 #include "chrome/common/pref_names.h" 33 #include "chrome/common/pref_names.h"
31 #include "extensions/browser/extension_function_registry.h" 34 #include "extensions/browser/extension_function_registry.h"
32 #include "extensions/browser/extension_prefs.h" 35 #include "extensions/browser/extension_prefs.h"
33 #include "extensions/browser/pref_names.h" 36 #include "extensions/browser/pref_names.h"
34 #include "extensions/common/api/generated_api.h" 37 #include "extensions/common/api/generated_api.h"
35 38
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 266
264 // Generated APIs from lower-level modules. 267 // Generated APIs from lower-level modules.
265 extensions::core_api::GeneratedFunctionRegistry::RegisterAll(registry); 268 extensions::core_api::GeneratedFunctionRegistry::RegisterAll(registry);
266 apps::api::GeneratedFunctionRegistry::RegisterAll(registry); 269 apps::api::GeneratedFunctionRegistry::RegisterAll(registry);
267 270
268 // Generated APIs from Chrome. 271 // Generated APIs from Chrome.
269 extensions::api::GeneratedFunctionRegistry::RegisterAll(registry); 272 extensions::api::GeneratedFunctionRegistry::RegisterAll(registry);
270 #endif 273 #endif
271 } 274 }
272 275
276 ComponentExtensionResourceManager*
277 ChromeExtensionsBrowserClient::GetComponentExtensionResourceManager() {
278 if (!resource_manager_)
279 resource_manager_.reset(new ChromeComponentExtensionResourceManager());
280 return resource_manager_.get();
281 }
282
273 scoped_ptr<extensions::RuntimeAPIDelegate> 283 scoped_ptr<extensions::RuntimeAPIDelegate>
274 ChromeExtensionsBrowserClient::CreateRuntimeAPIDelegate( 284 ChromeExtensionsBrowserClient::CreateRuntimeAPIDelegate(
275 content::BrowserContext* context) const { 285 content::BrowserContext* context) const {
276 return scoped_ptr<extensions::RuntimeAPIDelegate>( 286 return scoped_ptr<extensions::RuntimeAPIDelegate>(
277 new ChromeRuntimeAPIDelegate(context)); 287 new ChromeRuntimeAPIDelegate(context));
278 } 288 }
279 289
280 } // namespace extensions 290 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698