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

Side by Side Diff: chrome/browser/sync/managed_user_signin_manager_wrapper.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/managed_user_signin_manager_wrapper.h" 5 #include "chrome/browser/sync/managed_user_signin_manager_wrapper.h"
6 6
7 #include "chrome/browser/profiles/profile.h" 7 #include "chrome/browser/profiles/profile.h"
8 #include "components/signin/core/browser/signin_manager_base.h" 8 #include "components/signin/core/browser/signin_manager_base.h"
9 #include "google_apis/gaia/gaia_constants.h" 9 #include "google_apis/gaia/gaia_constants.h"
10 10
11 #if defined(ENABLE_MANAGED_USERS) 11 #if defined(ENABLE_MANAGED_USERS)
12 #include "chrome/browser/managed_mode/managed_user_constants.h" 12 #include "chrome/browser/managed_mode/managed_user_constants.h"
13 #endif 13 #endif
14 14
15 ManagedUserSigninManagerWrapper::ManagedUserSigninManagerWrapper( 15 ManagedUserSigninManagerWrapper::ManagedUserSigninManagerWrapper(
16 Profile* profile, 16 Profile* profile,
17 SigninManagerBase* original) 17 SigninManagerBase* original)
18 : profile_(profile), original_(original) {} 18 : profile_(profile), original_(original) {}
19 19
20 ManagedUserSigninManagerWrapper::~ManagedUserSigninManagerWrapper() { 20 ManagedUserSigninManagerWrapper::~ManagedUserSigninManagerWrapper() {
21 } 21 }
22 22
23 SigninManagerBase* ManagedUserSigninManagerWrapper::GetOriginal() { 23 SigninManagerBase* ManagedUserSigninManagerWrapper::GetOriginal() {
24 return original_; 24 return original_;
25 } 25 }
26 26
27 std::string ManagedUserSigninManagerWrapper::GetEffectiveUsername() const { 27 std::string ManagedUserSigninManagerWrapper::GetEffectiveUsername() const {
28 const std::string& auth_username = original_->GetAuthenticatedUsername(); 28 const std::string& auth_username = original_->GetAuthenticatedUsername();
29 #if defined(ENABLE_MANAGED_USERS) 29 #if defined(ENABLE_MANAGED_USERS)
30 if (auth_username.empty() && profile_->IsManaged()) 30 if (auth_username.empty() && profile_->IsSupervised())
31 return managed_users::kManagedUserPseudoEmail; 31 return managed_users::kManagedUserPseudoEmail;
32 #endif 32 #endif
33 return auth_username; 33 return auth_username;
34 } 34 }
35 35
36 std::string ManagedUserSigninManagerWrapper::GetAccountIdToUse() const { 36 std::string ManagedUserSigninManagerWrapper::GetAccountIdToUse() const {
37 const std::string& auth_account = original_->GetAuthenticatedAccountId(); 37 const std::string& auth_account = original_->GetAuthenticatedAccountId();
38 #if defined(ENABLE_MANAGED_USERS) 38 #if defined(ENABLE_MANAGED_USERS)
39 if (auth_account.empty() && profile_->IsManaged()) 39 if (auth_account.empty() && profile_->IsSupervised())
40 return managed_users::kManagedUserPseudoEmail; 40 return managed_users::kManagedUserPseudoEmail;
41 #endif 41 #endif
42 return auth_account; 42 return auth_account;
43 } 43 }
44 44
45 std::string ManagedUserSigninManagerWrapper::GetSyncScopeToUse() const { 45 std::string ManagedUserSigninManagerWrapper::GetSyncScopeToUse() const {
46 #if defined(ENABLE_MANAGED_USERS) 46 #if defined(ENABLE_MANAGED_USERS)
47 const std::string& auth_account = original_->GetAuthenticatedAccountId(); 47 const std::string& auth_account = original_->GetAuthenticatedAccountId();
48 if (auth_account.empty() && profile_->IsManaged()) 48 if (auth_account.empty() && profile_->IsSupervised())
49 return GaiaConstants::kChromeSyncManagedOAuth2Scope; 49 return GaiaConstants::kChromeSyncSupervisedOAuth2Scope;
50 #endif 50 #endif
51 return GaiaConstants::kChromeSyncOAuth2Scope; 51 return GaiaConstants::kChromeSyncOAuth2Scope;
52 } 52 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/synced_tab_delegate_android.cc ('k') | chrome/browser/sync/profile_sync_components_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698