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

Side by Side Diff: chrome/browser/ui/sync/tab_contents_synced_tab_delegate.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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h" 5 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h"
6 6
7 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
8 #include "chrome/browser/extensions/tab_helper.h" 8 #include "chrome/browser/extensions/tab_helper.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/sessions/session_tab_helper.h" 10 #include "chrome/browser/sessions/session_tab_helper.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 } 67 }
68 68
69 NavigationEntry* TabContentsSyncedTabDelegate::GetEntryAtIndex(int i) const { 69 NavigationEntry* TabContentsSyncedTabDelegate::GetEntryAtIndex(int i) const {
70 return web_contents_->GetController().GetEntryAtIndex(i); 70 return web_contents_->GetController().GetEntryAtIndex(i);
71 } 71 }
72 72
73 NavigationEntry* TabContentsSyncedTabDelegate::GetActiveEntry() const { 73 NavigationEntry* TabContentsSyncedTabDelegate::GetActiveEntry() const {
74 return web_contents_->GetController().GetVisibleEntry(); 74 return web_contents_->GetController().GetVisibleEntry();
75 } 75 }
76 76
77 bool TabContentsSyncedTabDelegate::ProfileIsManaged() const { 77 bool TabContentsSyncedTabDelegate::ProfileIsSupervised() const {
78 return profile()->IsManaged(); 78 return profile()->IsSupervised();
79 } 79 }
80 80
81 const std::vector<const content::NavigationEntry*>* 81 const std::vector<const content::NavigationEntry*>*
82 TabContentsSyncedTabDelegate::GetBlockedNavigations() const { 82 TabContentsSyncedTabDelegate::GetBlockedNavigations() const {
83 #if defined(ENABLE_MANAGED_USERS) 83 #if defined(ENABLE_MANAGED_USERS)
84 ManagedModeNavigationObserver* navigation_observer = 84 ManagedModeNavigationObserver* navigation_observer =
85 ManagedModeNavigationObserver::FromWebContents(web_contents_); 85 ManagedModeNavigationObserver::FromWebContents(web_contents_);
86 DCHECK(navigation_observer); 86 DCHECK(navigation_observer);
87 return navigation_observer->blocked_navigations(); 87 return navigation_observer->blocked_navigations();
88 #else 88 #else
(...skipping 16 matching lines...) Expand all
105 return web_contents_; 105 return web_contents_;
106 } 106 }
107 107
108 int TabContentsSyncedTabDelegate::GetSyncId() const { 108 int TabContentsSyncedTabDelegate::GetSyncId() const {
109 return sync_session_id_; 109 return sync_session_id_;
110 } 110 }
111 111
112 void TabContentsSyncedTabDelegate::SetSyncId(int sync_id) { 112 void TabContentsSyncedTabDelegate::SetSyncId(int sync_id) {
113 sync_session_id_ = sync_id; 113 sync_session_id_ = sync_id;
114 } 114 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698