chrome/browser/supervised_user/supervised_user_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: chrome/browser/supervised_user/supervised_user_resource_throttle.cc

Issue 2535723005: Stop using ResourceController in ResourceThrottle (Closed)

Patch Set: Addressed #62 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

« no previous file with comments | « chrome/browser/prerender/prerender_resource_throttle_unittest.cc ('k') | components/web_restrictions/browser/web_restrictions_resource_throttle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_resource_throttle.cc

diff --git a/chrome/browser/supervised_user/supervised_user_resource_throttle.cc b/chrome/browser/supervised_user/supervised_user_resource_throttle.cc

index ad168698232afb5e89ee92463e30dca2484a9815..a0695f62832cb69fde6718abf6ec87705b757bce 100644

--- a/chrome/browser/supervised_user/supervised_user_resource_throttle.cc

+++ b/chrome/browser/supervised_user/supervised_user_resource_throttle.cc

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

#include "chrome/browser/supervised_user/supervised_user_navigation_observer.h"

#include "chrome/browser/supervised_user/supervised_user_url_filter.h"

#include "content/public/browser/browser_thread.h"

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

#include "content/public/browser/resource_request_info.h"

#include "net/url_request/redirect_info.h"

#include "net/url_request/url_request.h"

@@ -206,13 +205,13 @@ void SupervisedUserResourceThrottle::OnCheckDone(

if (behavior == SupervisedUserURLFilter::BLOCK)

ShowInterstitial(url, reason);

else if (deferred_)

- controller()->Resume();

+ Resume();

}

void SupervisedUserResourceThrottle::OnInterstitialResult(

bool continue_request) {

if (continue_request)

- controller()->Resume();

+ Resume();

else

- controller()->Cancel();

+ Cancel();

}