chrome/browser/supervised_user/supervised_user_service.cc - Issue 753683004: Revert of Supervised user SafeSites: Expose & use API key from src-internal

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

Issue 753683004: Revert of Supervised user SafeSites: Expose & use API key from src-internal (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 1 month 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/supervised_user/supervised_user_service.h ('k') | chrome/browser/supervised_user/supervised_user_url_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_service.cc

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

index 2a8a495d30a0e98c912a2f95c1772fe908945421..5e2d409cd7707d58d43c94041512f75873080991 100644

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

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

@@ -172,13 +172,14 @@

void SupervisedUserService::URLFilterContext::InitAsyncURLChecker(

net::URLRequestContextGetter* context,

- const std::string& cx) {

- ui_url_filter_->InitAsyncURLChecker(context, cx);

+ const std::string& cx,

+ const std::string& api_key) {

+ ui_url_filter_->InitAsyncURLChecker(context, cx, api_key);

BrowserThread::PostTask(

BrowserThread::IO,

FROM_HERE,

base::Bind(&SupervisedUserURLFilter::InitAsyncURLChecker,

- io_url_filter_, context, cx));

+ io_url_filter_, context, cx, api_key));

}

SupervisedUserService::SupervisedUserService(Profile* profile)

@@ -870,7 +871,7 @@

const std::string& cx = delegate_->GetSafeSitesCx();

if (!cx.empty()) {

url_filter_context_.InitAsyncURLChecker(

- profile_->GetRequestContext(), cx);

+ profile_->GetRequestContext(), cx, delegate_->GetSafeSitesApiKey());

}