chrome/browser/supervised_user/permission_request_creator_apiary.cc - Issue 335273005: Rename "managed (mode|user)" to "supervised user" (part 3)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/supervised_user/permission_request_creator_apiary.cc

Issue 335273005: Rename "managed (mode|user)" to "supervised user" (part 3) (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

« no previous file with comments | « chrome/browser/supervised_user/permission_request_creator_apiary.h ('k') | chrome/browser/supervised_user/permission_request_creator_sync.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/permission_request_creator_apiary.cc

diff --git a/chrome/browser/supervised_user/permission_request_creator_apiary.cc b/chrome/browser/supervised_user/permission_request_creator_apiary.cc

index a590fdb672d3e0b0f60e4e46c6fee54ec49d0651..91f93fc553d1c80013ffb5c1c8005299bc1c85f0 100644

--- a/chrome/browser/supervised_user/permission_request_creator_apiary.cc

+++ b/chrome/browser/supervised_user/permission_request_creator_apiary.cc

@@ -14,7 +14,7 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

#include "chrome/browser/signin/signin_manager_factory.h"

-#include "chrome/browser/sync/managed_user_signin_manager_wrapper.h"

+#include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"

#include "chrome/common/chrome_switches.h"

#include "components/signin/core/browser/profile_oauth2_token_service.h"

#include "components/signin/core/browser/signin_manager.h"

@@ -37,7 +37,7 @@ static const char kAuthorizationHeaderFormat[] = "Authorization: Bearer %s";

PermissionRequestCreatorApiary::PermissionRequestCreatorApiary(

OAuth2TokenService* oauth2_token_service,

- scoped_ptr<ManagedUserSigninManagerWrapper> signin_wrapper,

+ scoped_ptr<SupervisedUserSigninManagerWrapper> signin_wrapper,

net::URLRequestContextGetter* context)

: OAuth2TokenService::Consumer("permissions_creator"),

oauth2_token_service_(oauth2_token_service),

@@ -53,8 +53,8 @@ PermissionRequestCreatorApiary::CreateWithProfile(Profile* profile) {

ProfileOAuth2TokenService* token_service =

ProfileOAuth2TokenServiceFactory::GetForProfile(profile);

SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile);

- scoped_ptr<ManagedUserSigninManagerWrapper> signin_wrapper(

- new ManagedUserSigninManagerWrapper(profile, signin));

+ scoped_ptr<SupervisedUserSigninManagerWrapper> signin_wrapper(

+ new SupervisedUserSigninManagerWrapper(profile, signin));

scoped_ptr<PermissionRequestCreator> creator(

new PermissionRequestCreatorApiary(

token_service, signin_wrapper.Pass(), profile->GetRequestContext()));