chrome/browser/themes/theme_service.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/themes/theme_service.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/themes/theme_service.cc

diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc

index 8d6d003cffd5468aa49d1bcb2c426996718c1e16..c7650acc314ee96a47ecfa9ddf7f18861f677190 100644

--- a/chrome/browser/themes/theme_service.cc

+++ b/chrome/browser/themes/theme_service.cc

@@ -13,8 +13,8 @@

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/extensions/extension_service.h"

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

#include "chrome/browser/profiles/profile.h"

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

#include "chrome/browser/themes/browser_theme_pack.h"

#include "chrome/browser/themes/custom_theme_supplier.h"

#include "chrome/browser/themes/theme_properties.h"

@@ -586,7 +586,7 @@ bool ThemeService::IsSupervisedUser() const {

}

void ThemeService::SetSupervisedUserTheme() {

- SetCustomDefaultTheme(new ManagedUserTheme);

+ SetCustomDefaultTheme(new SupervisedUserTheme);

}

void ThemeService::OnInfobarDisplayed() {