components/web_restrictions/browser/web_restrictions_resource_throttle.cc - Issue 2535723005: Stop using ResourceController in ResourceThrottle

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/web_restrictions/browser/web_restrictions_resource_throttle.cc

Issue 2535723005: Stop using ResourceController in ResourceThrottle (Closed)

Patch Set: Addressed #48 Created 4 years 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

« chrome/browser/extensions/user_script_listener_unittest.cc ('K') | « chrome/browser/supervised_user/supervised_user_resource_throttle.cc ('k') | components/web_restrictions/browser/web_restrictions_resource_throttle_unittest.cc » ('j') | content/public/browser/resource_throttle.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/web_restrictions/browser/web_restrictions_resource_throttle.cc

diff --git a/components/web_restrictions/browser/web_restrictions_resource_throttle.cc b/components/web_restrictions/browser/web_restrictions_resource_throttle.cc

index 6f83f08faee8a62646515adbf83287ae6840a0ca..1f78a4a5ed2f8b3660e7b546c7a9cd4114256e78 100644

--- a/components/web_restrictions/browser/web_restrictions_resource_throttle.cc

+++ b/components/web_restrictions/browser/web_restrictions_resource_throttle.cc

@@ -6,7 +6,6 @@

#include "base/bind.h"

#include "components/web_restrictions/browser/web_restrictions_client.h"

-#include "content/public/browser/resource_controller.h"

#include "net/base/net_errors.h"

#include "net/url_request/redirect_info.h"

#include "net/url_request/url_request.h"

@@ -53,9 +52,9 @@ bool WebRestrictionsResourceThrottle::ShouldDefer(const GURL& url) {

void WebRestrictionsResourceThrottle::OnCheckResult(const bool should_proceed) {

if (should_proceed) {

- controller()->Resume();

+ Resume();

} else {

- controller()->CancelWithError(net::ERR_BLOCKED_BY_ADMINISTRATOR);

+ CancelWithError(net::ERR_BLOCKED_BY_ADMINISTRATOR);

}