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

Side by Side Diff: chrome/browser/sync/glue/synced_tab_delegate_android.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/sync/glue/synced_tab_delegate_android.h" 5 #include "chrome/browser/sync/glue/synced_tab_delegate_android.h"
6 6
7 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
8 #include "chrome/browser/android/tab_android.h" 8 #include "chrome/browser/android/tab_android.h"
9 #include "chrome/browser/extensions/tab_helper.h" 9 #include "chrome/browser/extensions/tab_helper.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 } 92 }
93 93
94 void SyncedTabDelegateAndroid::SetWebContents( 94 void SyncedTabDelegateAndroid::SetWebContents(
95 content::WebContents* web_contents) { 95 content::WebContents* web_contents) {
96 web_contents_ = web_contents; 96 web_contents_ = web_contents;
97 TabContentsSyncedTabDelegate::CreateForWebContents(web_contents_); 97 TabContentsSyncedTabDelegate::CreateForWebContents(web_contents_);
98 } 98 }
99 99
100 void SyncedTabDelegateAndroid::ResetWebContents() { web_contents_ = NULL; } 100 void SyncedTabDelegateAndroid::ResetWebContents() { web_contents_ = NULL; }
101 101
102 bool SyncedTabDelegateAndroid::ProfileIsManaged() const { 102 bool SyncedTabDelegateAndroid::ProfileIsSupervised() const {
103 return TabContentsSyncedTabDelegate::FromWebContents(web_contents_) 103 return TabContentsSyncedTabDelegate::FromWebContents(web_contents_)
104 ->ProfileIsManaged(); 104 ->ProfileIsSupervised();
105 } 105 }
106 106
107 const std::vector<const content::NavigationEntry*>* 107 const std::vector<const content::NavigationEntry*>*
108 SyncedTabDelegateAndroid::GetBlockedNavigations() const { 108 SyncedTabDelegateAndroid::GetBlockedNavigations() const {
109 return TabContentsSyncedTabDelegate::FromWebContents(web_contents_) 109 return TabContentsSyncedTabDelegate::FromWebContents(web_contents_)
110 ->GetBlockedNavigations(); 110 ->GetBlockedNavigations();
111 } 111 }
112 112
113 int SyncedTabDelegateAndroid::GetSyncId() const { 113 int SyncedTabDelegateAndroid::GetSyncId() const {
114 return tab_android_->GetSyncId(); 114 return tab_android_->GetSyncId();
115 } 115 }
116 116
117 void SyncedTabDelegateAndroid::SetSyncId(int sync_id) { 117 void SyncedTabDelegateAndroid::SetSyncId(int sync_id) {
118 tab_android_->SetSyncId(sync_id); 118 tab_android_->SetSyncId(sync_id);
119 } 119 }
120 120
121 // static 121 // static
122 SyncedTabDelegate* SyncedTabDelegate::ImplFromWebContents( 122 SyncedTabDelegate* SyncedTabDelegate::ImplFromWebContents(
123 content::WebContents* web_contents) { 123 content::WebContents* web_contents) {
124 TabAndroid* tab = TabAndroid::FromWebContents(web_contents); 124 TabAndroid* tab = TabAndroid::FromWebContents(web_contents);
125 return tab ? tab->GetSyncedTabDelegate() : NULL; 125 return tab ? tab->GetSyncedTabDelegate() : NULL;
126 } 126 }
127 } // namespace browser_sync 127 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/synced_tab_delegate_android.h ('k') | chrome/browser/sync/managed_user_signin_manager_wrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698