Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8082)

Unified Diff: chrome/browser/ui/webui/history_ui.cc

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
Index: chrome/browser/ui/webui/history_ui.cc
diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc
index 65bf4179ef5cc1bf6ecbfc00b2f83e42a00bf93d..604624c51038bb966bc8aa570c70466d9811fa2f 100644
--- a/chrome/browser/ui/webui/history_ui.cc
+++ b/chrome/browser/ui/webui/history_ui.cc
@@ -184,8 +184,8 @@ content::WebUIDataSource* CreateHistoryUIHTMLSource(Profile* profile) {
source->SetDefaultResource(IDR_HISTORY_HTML);
source->SetUseJsonJSFormatV2();
source->DisableDenyXFrameOptions();
- source->AddBoolean("isManagedProfile", profile->IsManaged());
- source->AddBoolean("showDeleteVisitUI", !profile->IsManaged());
+ source->AddBoolean("isManagedProfile", profile->IsSupervised());
+ source->AddBoolean("showDeleteVisitUI", !profile->IsSupervised());
return source;
}
@@ -711,7 +711,7 @@ void BrowsingHistoryHandler::ReturnResultsToFrontEnd() {
BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile);
ManagedUserService* managed_user_service = NULL;
#if defined(ENABLE_MANAGED_USERS)
- if (profile->IsManaged())
+ if (profile->IsSupervised())
managed_user_service = ManagedUserServiceFactory::GetForProfile(profile);
#endif
ProfileSyncService* sync_service =
« no previous file with comments | « chrome/browser/ui/webui/extensions/extension_settings_handler.cc ('k') | chrome/browser/ui/webui/ntp/ntp_login_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698