chrome/browser/ui/sync/tab_contents_synced_tab_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/ui/sync/tab_contents_synced_tab_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: review comments (+ a few other cleanups) 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:

Index: chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc

diff --git a/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc b/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc

index 8e5c44789a20529ae35b5cfc7c1d0f7db4e3ed13..40f2d3ac05bc3094c880d7be566fddcb035dd10d 100644

--- a/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc

+++ b/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc

@@ -15,7 +15,7 @@

#include "extensions/common/extension.h"

#if defined(ENABLE_MANAGED_USERS)

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

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

#endif

using content::NavigationEntry;

@@ -81,8 +81,8 @@ bool TabContentsSyncedTabDelegate::ProfileIsSupervised() const {

const std::vector<const content::NavigationEntry*>*

TabContentsSyncedTabDelegate::GetBlockedNavigations() const {

#if defined(ENABLE_MANAGED_USERS)

- ManagedModeNavigationObserver* navigation_observer =

- ManagedModeNavigationObserver::FromWebContents(web_contents_);

+ SupervisedUserNavigationObserver* navigation_observer =

+ SupervisedUserNavigationObserver::FromWebContents(web_contents_);

DCHECK(navigation_observer);

return navigation_observer->blocked_navigations();

#else