chrome/browser/supervised_user/supervised_user_navigation_observer.cc - Issue 1808653003: Move the supervised user error page to a component

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_navigation_observer.cc

Issue 1808653003: Move the supervised user error page to a component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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

« chrome/browser/supervised_user/supervised_user_interstitial.h ('K') | « chrome/browser/supervised_user/supervised_user_navigation_observer.h ('k') | chrome/browser/supervised_user/supervised_user_resource_throttle.h » ('j') | components/resources/components_resources.grd » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_navigation_observer.cc

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

index fda80c997eddd2c332f922261de0fe494ea1e054..a0840f7c99c25747ec76055ec563c5900b2fd66f 100644

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

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

@@ -43,7 +43,7 @@ SupervisedUserNavigationObserver::SupervisedUserNavigationObserver(

void SupervisedUserNavigationObserver::OnRequestBlocked(

const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter,

const GURL& url,

- SupervisedUserURLFilter::FilteringBehaviorReason reason,

+ supervised_user_error_page::FilteringBehaviorReason reason,

const base::Callback<void(bool)>& callback) {

content::WebContents* web_contents = web_contents_getter.Run();

if (!web_contents) {

@@ -104,7 +104,7 @@ void SupervisedUserNavigationObserver::OnURLFilterChanged() {

void SupervisedUserNavigationObserver::URLFilterCheckCallback(

const GURL& url,

SupervisedUserURLFilter::FilteringBehavior behavior,

- SupervisedUserURLFilter::FilteringBehaviorReason reason,

+ supervised_user_error_page::FilteringBehaviorReason reason,

bool uncertain) {

// If the page has been changed in the meantime, we can exit.

if (url != web_contents_->GetLastCommittedURL())