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 "chrome/browser/extensions/chrome_extensions_browser_client.h" | 5 #include "chrome/browser/extensions/chrome_extensions_browser_client.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/version.h" | 9 #include "base/version.h" |
10 #include "chrome/browser/app_mode/app_mode_utils.h" | 10 #include "chrome/browser/app_mode/app_mode_utils.h" |
11 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
12 #include "chrome/browser/extensions/activity_log/activity_log.h" | 12 #include "chrome/browser/extensions/activity_log/activity_log.h" |
13 #include "chrome/browser/extensions/api/chrome_extensions_api_client.h" | 13 #include "chrome/browser/extensions/api/chrome_extensions_api_client.h" |
14 #include "chrome/browser/extensions/api/content_settings/content_settings_servic
e.h" | 14 #include "chrome/browser/extensions/api/content_settings/content_settings_servic
e.h" |
15 #include "chrome/browser/extensions/api/generated_api_registration.h" | 15 #include "chrome/browser/extensions/api/generated_api_registration.h" |
16 #include "chrome/browser/extensions/api/preference/chrome_direct_setting.h" | 16 #include "chrome/browser/extensions/api/preference/chrome_direct_setting.h" |
17 #include "chrome/browser/extensions/api/preference/preference_api.h" | 17 #include "chrome/browser/extensions/api/preference/preference_api.h" |
18 #include "chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.h" | 18 #include "chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.h" |
19 #include "chrome/browser/extensions/chrome_app_sorting.h" | 19 #include "chrome/browser/extensions/chrome_app_sorting.h" |
20 #include "chrome/browser/extensions/chrome_component_extension_resource_manager.
h" | 20 #include "chrome/browser/extensions/chrome_component_extension_resource_manager.
h" |
21 #include "chrome/browser/extensions/chrome_extension_host_delegate.h" | 21 #include "chrome/browser/extensions/chrome_extension_host_delegate.h" |
22 #include "chrome/browser/extensions/chrome_process_manager_delegate.h" | 22 #include "chrome/browser/extensions/chrome_process_manager_delegate.h" |
| 23 #include "chrome/browser/extensions/chrome_url_request_util.h" |
23 #include "chrome/browser/extensions/event_router_forwarder.h" | 24 #include "chrome/browser/extensions/event_router_forwarder.h" |
24 #include "chrome/browser/extensions/extension_system_factory.h" | 25 #include "chrome/browser/extensions/extension_system_factory.h" |
25 #include "chrome/browser/extensions/extension_util.h" | 26 #include "chrome/browser/extensions/extension_util.h" |
26 #include "chrome/browser/extensions/url_request_util.h" | |
27 #include "chrome/browser/external_protocol/external_protocol_handler.h" | 27 #include "chrome/browser/external_protocol/external_protocol_handler.h" |
28 #include "chrome/browser/net/chrome_net_log.h" | 28 #include "chrome/browser/net/chrome_net_log.h" |
29 #include "chrome/browser/profiles/profile.h" | 29 #include "chrome/browser/profiles/profile.h" |
30 #include "chrome/browser/profiles/profile_manager.h" | 30 #include "chrome/browser/profiles/profile_manager.h" |
31 #include "chrome/common/chrome_paths.h" | 31 #include "chrome/common/chrome_paths.h" |
32 #include "chrome/common/chrome_switches.h" | 32 #include "chrome/common/chrome_switches.h" |
33 #include "chrome/common/chrome_version_info.h" | 33 #include "chrome/common/chrome_version_info.h" |
34 #include "chrome/common/extensions/features/feature_channel.h" | 34 #include "chrome/common/extensions/features/feature_channel.h" |
35 #include "chrome/common/pref_names.h" | 35 #include "chrome/common/pref_names.h" |
36 #include "extensions/browser/api/generated_api_registration.h" | 36 #include "extensions/browser/api/generated_api_registration.h" |
37 #include "extensions/browser/extension_function_registry.h" | 37 #include "extensions/browser/extension_function_registry.h" |
38 #include "extensions/browser/extension_prefs.h" | 38 #include "extensions/browser/extension_prefs.h" |
39 #include "extensions/browser/pref_names.h" | 39 #include "extensions/browser/pref_names.h" |
| 40 #include "extensions/browser/url_request_util.h" |
40 | 41 |
41 #if defined(OS_CHROMEOS) | 42 #if defined(OS_CHROMEOS) |
42 #include "chromeos/chromeos_switches.h" | 43 #include "chromeos/chromeos_switches.h" |
43 #endif | 44 #endif |
44 | 45 |
45 namespace extensions { | 46 namespace extensions { |
46 | 47 |
47 ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() { | 48 ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() { |
48 process_manager_delegate_.reset(new ChromeProcessManagerDelegate); | 49 process_manager_delegate_.reset(new ChromeProcessManagerDelegate); |
49 api_client_.reset(new ChromeExtensionsAPIClient); | 50 api_client_.reset(new ChromeExtensionsAPIClient); |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
118 return url_request_util::IsWebViewRequest(request); | 119 return url_request_util::IsWebViewRequest(request); |
119 } | 120 } |
120 | 121 |
121 net::URLRequestJob* | 122 net::URLRequestJob* |
122 ChromeExtensionsBrowserClient::MaybeCreateResourceBundleRequestJob( | 123 ChromeExtensionsBrowserClient::MaybeCreateResourceBundleRequestJob( |
123 net::URLRequest* request, | 124 net::URLRequest* request, |
124 net::NetworkDelegate* network_delegate, | 125 net::NetworkDelegate* network_delegate, |
125 const base::FilePath& directory_path, | 126 const base::FilePath& directory_path, |
126 const std::string& content_security_policy, | 127 const std::string& content_security_policy, |
127 bool send_cors_header) { | 128 bool send_cors_header) { |
128 return url_request_util::MaybeCreateURLRequestResourceBundleJob( | 129 return chrome_url_request_util::MaybeCreateURLRequestResourceBundleJob( |
129 request, | 130 request, |
130 network_delegate, | 131 network_delegate, |
131 directory_path, | 132 directory_path, |
132 content_security_policy, | 133 content_security_policy, |
133 send_cors_header); | 134 send_cors_header); |
134 } | 135 } |
135 | 136 |
136 bool ChromeExtensionsBrowserClient::AllowCrossRendererResourceLoad( | 137 bool ChromeExtensionsBrowserClient::AllowCrossRendererResourceLoad( |
137 net::URLRequest* request, | 138 net::URLRequest* request, |
138 bool is_incognito, | 139 bool is_incognito, |
139 const Extension* extension, | 140 const Extension* extension, |
140 InfoMap* extension_info_map) { | 141 InfoMap* extension_info_map) { |
141 return url_request_util::AllowCrossRendererResourceLoad( | 142 bool allowed = false; |
142 request, is_incognito, extension, extension_info_map); | 143 if (chrome_url_request_util::AllowCrossRendererResourceLoad( |
| 144 request, is_incognito, extension, extension_info_map, &allowed)) |
| 145 return allowed; |
| 146 |
| 147 // Couldn't determine if resource is allowed. Block the load. |
| 148 return false; |
143 } | 149 } |
144 | 150 |
145 PrefService* ChromeExtensionsBrowserClient::GetPrefServiceForContext( | 151 PrefService* ChromeExtensionsBrowserClient::GetPrefServiceForContext( |
146 content::BrowserContext* context) { | 152 content::BrowserContext* context) { |
147 return static_cast<Profile*>(context)->GetPrefs(); | 153 return static_cast<Profile*>(context)->GetPrefs(); |
148 } | 154 } |
149 | 155 |
150 void ChromeExtensionsBrowserClient::GetEarlyExtensionPrefsObservers( | 156 void ChromeExtensionsBrowserClient::GetEarlyExtensionPrefsObservers( |
151 content::BrowserContext* context, | 157 content::BrowserContext* context, |
152 std::vector<ExtensionPrefsObserver*>* observers) const { | 158 std::vector<ExtensionPrefsObserver*>* observers) const { |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
260 } | 266 } |
261 | 267 |
262 scoped_ptr<extensions::RuntimeAPIDelegate> | 268 scoped_ptr<extensions::RuntimeAPIDelegate> |
263 ChromeExtensionsBrowserClient::CreateRuntimeAPIDelegate( | 269 ChromeExtensionsBrowserClient::CreateRuntimeAPIDelegate( |
264 content::BrowserContext* context) const { | 270 content::BrowserContext* context) const { |
265 return scoped_ptr<extensions::RuntimeAPIDelegate>( | 271 return scoped_ptr<extensions::RuntimeAPIDelegate>( |
266 new ChromeRuntimeAPIDelegate(context)); | 272 new ChromeRuntimeAPIDelegate(context)); |
267 } | 273 } |
268 | 274 |
269 } // namespace extensions | 275 } // namespace extensions |
OLD | NEW |