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

Unified Diff: chrome/browser/extensions/chrome_url_request_util.cc

Issue 574793003: Moving webview media permission request to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Switching to weak ptrs 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/chrome_url_request_util.cc
diff --git a/chrome/browser/extensions/chrome_url_request_util.cc b/chrome/browser/extensions/chrome_url_request_util.cc
index 41140d4c3e30c26f94b149c953a0260cb3aba07a..03822b07c08b97a6404e591133c68a2182277664 100644
--- a/chrome/browser/extensions/chrome_url_request_util.cc
+++ b/chrome/browser/extensions/chrome_url_request_util.cc
@@ -131,10 +131,10 @@ namespace extensions {
namespace chrome_url_request_util {
bool AllowCrossRendererResourceLoad(net::URLRequest* request,
- bool is_incognito,
- const Extension* extension,
- InfoMap* extension_info_map,
- bool* allowed) {
+ bool is_incognito,
+ const Extension* extension,
+ InfoMap* extension_info_map,
+ bool* allowed) {
if (url_request_util::AllowCrossRendererResourceLoad(
request, is_incognito, extension, extension_info_map, allowed)) {
return true;
@@ -171,9 +171,10 @@ net::URLRequestJob* MaybeCreateURLRequestResourceBundleJob(
base::FilePath request_path =
extensions::file_util::ExtensionURLToRelativeFilePath(request->url());
int resource_id = 0;
- if (ExtensionsBrowserClient::Get()->GetComponentExtensionResourceManager()->
- IsComponentExtensionResource(
- directory_path, request_path, &resource_id)) {
+ if (ExtensionsBrowserClient::Get()
+ ->GetComponentExtensionResourceManager()
+ ->IsComponentExtensionResource(
+ directory_path, request_path, &resource_id)) {
relative_path = relative_path.Append(request_path);
relative_path = relative_path.NormalizePathSeparators();
return new URLRequestResourceBundleJob(request,

Powered by Google App Engine
This is Rietveld 408576698