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

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

Issue 573843002: Allows webview to access extension resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix problems with early returns. Created 6 years, 3 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
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 "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"
(...skipping 19 matching lines...) Expand all
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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 (url_request_util::ChromeAllowCrossRendererResourceLoad(
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
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
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/url_request_util.h » ('j') | chrome/browser/extensions/url_request_util.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698