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

Unified Diff: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Issue 10946008: Componentize IgnoreNavigationResourceThrottle and add chrome and webview specific implementations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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/renderer_host/chrome_resource_dispatcher_host_delegate.cc
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
index cbeed67b33132465d3b771b8cd31f50d91f02390..ee06dda7ac2687fb9f77aaa63f5a14e09f124999 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -46,6 +46,9 @@
// TODO(oshima): Enable this for other platforms.
#if defined(OS_CHROMEOS)
#include "chrome/browser/renderer_host/offline_resource_throttle.h"
+#elif defined(OS_ANDROID)
benm (inactive) 2012/09/19 11:04:04 should this be it's own #if? Doesn't seem like an
mkosiba (inactive) 2012/09/25 18:01:47 Done.
+#include "chrome/browser/android/chrome_intercept_navigation_resource_throttle.h"
+using chrome::android::ChromeInterceptNavigationResourceThrottle;
#endif
using content::BrowserThread;
@@ -133,14 +136,17 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning(
request->set_priority(net::IDLE);
}
-#if defined(OS_CHROMEOS)
if (resource_type == ResourceType::MAIN_FRAME) {
+#if defined(OS_CHROMEOS)
// We check offline first, then check safe browsing so that we still can
// block unsafe site after we remove offline page.
throttles->push_back(new OfflineResourceThrottle(
child_id, route_id, request, appcache_service));
- }
+#elif defined(OS_ANDROID)
+ throttles->push_back(ChromeInterceptNavigationResourceThrottle::Create(
+ request));
#endif
+ }
AppendChromeMetricsHeaders(request, resource_context, resource_type);

Powered by Google App Engine
This is Rietveld 408576698