chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc - Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2)

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/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: similarity 25 Created 6 years, 6 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

« no previous file with comments | « chrome/browser/profiles/profile_manager.cc ('k') | chrome/browser/search/search.cc » ('j') | chrome/browser/supervised_user/supervised_user_interstitial.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

index c1f959b5bbf429475f1ffcad6347237098852c04..6a52315bfa370db494404c115d8ec991cd461281 100644

--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

@@ -65,7 +65,7 @@

#endif

#if defined(ENABLE_MANAGED_USERS)

-#include "chrome/browser/managed_mode/managed_mode_resource_throttle.h"

+#include "chrome/browser/supervised_user/supervised_user_resource_throttle.h"

#endif

#if defined(USE_SYSTEM_PROTOBUF)

@@ -495,9 +495,9 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles(

#if defined(ENABLE_MANAGED_USERS)

bool is_subresource_request = resource_type != ResourceType::MAIN_FRAME;

- throttles->push_back(new ManagedModeResourceThrottle(

+ throttles->push_back(new SupervisedUserResourceThrottle(

request, !is_subresource_request,

- io_data->managed_mode_url_filter()));

+ io_data->supervised_user_url_filter()));

#endif

content::ResourceThrottle* throttle =