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

Unified Diff: android_webview/native/net_init_native_callback.cc

Issue 12377051: [android_webview] Don't intercept resource and asset URLRequests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 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
« no previous file with comments | « android_webview/native/intercepted_request_data_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/native/net_init_native_callback.cc
diff --git a/android_webview/native/net_init_native_callback.cc b/android_webview/native/net_init_native_callback.cc
index be20a7d9ebc969d9ed756a60cc3d926ad4aee95d..d291dfd0079d81a662a591efb85cd31c2a5ecdec 100644
--- a/android_webview/native/net_init_native_callback.cc
+++ b/android_webview/native/net_init_native_callback.cc
@@ -8,7 +8,6 @@
#include "android_webview/native/android_protocol_handler.h"
#include "android_webview/native/cookie_manager.h"
#include "base/logging.h"
-#include "net/url_request/url_request_job_factory.h"
namespace android_webview {
class AwURLRequestJobFactory;
@@ -18,9 +17,14 @@ void DidCreateCookieMonster(net::CookieMonster* cookie_monster) {
SetCookieMonsterOnNetworkStackInit(cookie_monster);
}
-scoped_ptr<net::URLRequestJobFactory> CreateAndroidJobFactory(
- scoped_ptr<AwURLRequestJobFactory> job_factory) {
- return CreateAndroidRequestJobFactory(job_factory.Pass());
+scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+CreateAndroidAssetFileProtocolHandler() {
+ return CreateAssetFileProtocolHandler();
+}
+
+scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+CreateAndroidContentProtocolHandler() {
+ return CreateContentSchemeProtocolHandler();
}
} // namespace android_webview
« no previous file with comments | « android_webview/native/intercepted_request_data_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698