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

Unified Diff: android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc

Issue 1423713015: [WIP] WebRestrictions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: continue review in split cl Created 4 years, 11 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: android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
diff --git a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
index 93045f354eedd8de5e514dbdb4ff6b8f2cb90e75..25c90c6e1d5fd8867002222c3a5326ccb66b0d84 100644
--- a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
+++ b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
@@ -6,6 +6,7 @@
#include <string>
+#include "android_webview/browser/aw_browser_context.h"
#include "android_webview/browser/aw_contents_io_thread_client.h"
#include "android_webview/browser/aw_login_delegate.h"
#include "android_webview/browser/aw_resource_context.h"
@@ -14,6 +15,7 @@
#include "base/memory/scoped_vector.h"
#include "components/auto_login_parser/auto_login_parser.h"
#include "components/navigation_interception/intercept_navigation_delegate.h"
+#include "components/web_restriction/web_restriction_resource_throttle.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/resource_controller.h"
#include "content/public/browser/resource_dispatcher_host.h"
@@ -221,8 +223,12 @@ void AwResourceDispatcherHostDelegate::RequestBeginning(
throttles->push_back(new IoThreadClientThrottle(
request_info->GetChildID(), request_info->GetRenderFrameID(), request));
- if (resource_type != content::RESOURCE_TYPE_MAIN_FRAME)
+ bool is_main_frame = resource_type == content::RESOURCE_TYPE_MAIN_FRAME;
+ if (!is_main_frame)
InterceptNavigationDelegate::UpdateUserGestureCarryoverInfo(request);
+ throttles->push_back(new web_restriction::WebRestrictionResourceThrottle(
+ AwBrowserContext::GetDefault()->GetWebRestrictionProvider(),
+ request->url(), is_main_frame));
}
void AwResourceDispatcherHostDelegate::OnRequestRedirected(

Powered by Google App Engine
This is Rietveld 408576698