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

Unified Diff: chrome/browser/sync/sessions/sessions_sync_manager.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/sync/sessions/sessions_sync_manager.cc
diff --git a/chrome/browser/sync/sessions/sessions_sync_manager.cc b/chrome/browser/sync/sessions/sessions_sync_manager.cc
index 022176c512c416298ac47f143411ff0bc47d92c7..72a01d2f8cfe792fa7dd8fbe87c829469535d734 100644
--- a/chrome/browser/sync/sessions/sessions_sync_manager.cc
+++ b/chrome/browser/sync/sessions/sessions_sync_manager.cc
@@ -916,7 +916,7 @@ void SessionsSyncManager::SetSessionTabFromDelegate(
const int min_index = std::max(0, current_index - kMaxSyncNavigationCount);
const int max_index = std::min(current_index + kMaxSyncNavigationCount,
tab_delegate.GetEntryCount());
- bool is_managed = tab_delegate.ProfileIsManaged();
+ bool is_supervised = tab_delegate.ProfileIsSupervised();
session_tab->navigations.clear();
for (int i = min_index; i < max_index; ++i) {
@@ -928,13 +928,13 @@ void SessionsSyncManager::SetSessionTabFromDelegate(
session_tab->navigations.push_back(
SerializedNavigationEntry::FromNavigationEntry(i, *entry));
- if (is_managed) {
+ if (is_supervised) {
session_tab->navigations.back().set_blocked_state(
SerializedNavigationEntry::STATE_ALLOWED);
}
}
- if (is_managed) {
+ if (is_supervised) {
const std::vector<const NavigationEntry*>& blocked_navigations =
*tab_delegate.GetBlockedNavigations();
int offset = session_tab->navigations.size();

Powered by Google App Engine
This is Rietveld 408576698