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

Unified Diff: android_webview/browser/net/aw_url_request_context_getter.cc

Issue 647853002: Create a proprietary scheme for loading web-accessible resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: brace for two-line if statement (why didn't clang-format change this?) Created 6 years, 1 month 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: android_webview/browser/net/aw_url_request_context_getter.cc
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
index 33f92a68b473594336f387d88c2e6274d4233c89..55c17d4ee9cb0ceb77d9b12197911666104d5b77 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -121,23 +121,18 @@ scoped_ptr<net::URLRequestJobFactory> CreateJobFactory(
DCHECK(set_protocol);
set_protocol = aw_job_factory->SetProtocolHandler(
url::kDataScheme, new net::DataProtocolHandler());
- DCHECK(set_protocol);
- set_protocol = aw_job_factory->SetProtocolHandler(
+ static const char* protocol_handlers_to_copy[] = {
jbroman 2014/11/14 18:46:35 I'm not sure why android_webview whitelists protoc
url::kBlobScheme,
- (*protocol_handlers)[url::kBlobScheme].release());
- DCHECK(set_protocol);
- set_protocol = aw_job_factory->SetProtocolHandler(
url::kFileSystemScheme,
- (*protocol_handlers)[url::kFileSystemScheme].release());
- DCHECK(set_protocol);
- set_protocol = aw_job_factory->SetProtocolHandler(
content::kChromeUIScheme,
- (*protocol_handlers)[content::kChromeUIScheme].release());
- DCHECK(set_protocol);
- set_protocol = aw_job_factory->SetProtocolHandler(
content::kChromeDevToolsScheme,
- (*protocol_handlers)[content::kChromeDevToolsScheme].release());
- DCHECK(set_protocol);
+ content::kResourceScheme,
+ };
+ for (const char* scheme : protocol_handlers_to_copy) {
+ set_protocol = aw_job_factory->SetProtocolHandler(
+ scheme, (*protocol_handlers)[scheme].release());
+ DCHECK(set_protocol);
+ }
protocol_handlers->clear();
// Note that even though the content:// scheme handler is created here,
« no previous file with comments | « no previous file | content/browser/child_process_security_policy_impl.cc » ('j') | content/browser/resource_protocol.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698