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

Unified Diff: chrome/browser/policy/cloud/user_policy_signin_service_ios.mm

Issue 197313004: Support policy registration using a preobtained access token. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 8 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/policy/cloud/user_policy_signin_service_ios.mm
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_ios.mm b/chrome/browser/policy/cloud/user_policy_signin_service_ios.mm
index 488b436f8d52239256ffc68f544e498bd4fc77fc..98c0f369b1f469704c94356efd60c2e833a53efc 100644
--- a/chrome/browser/policy/cloud/user_policy_signin_service_ios.mm
+++ b/chrome/browser/policy/cloud/user_policy_signin_service_ios.mm
@@ -13,12 +13,10 @@
#include "base/prefs/pref_service.h"
#include "base/time/time.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
#include "chrome/common/pref_names.h"
#include "components/policy/core/common/cloud/cloud_policy_client_registration_helper.h"
#include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
#include "components/policy/core/common/policy_switches.h"
-#include "components/signin/core/browser/profile_oauth2_token_service.h"
#include "components/signin/core/browser/signin_manager.h"
#include "net/base/network_change_notifier.h"
#include "net/url_request/url_request_context_getter.h"
@@ -52,13 +50,13 @@ UserPolicySigninService::UserPolicySigninService(
signin_manager,
system_request_context),
weak_factory_(this),
- oauth2_token_service_(token_service),
profile_prefs_(profile->GetPrefs()) {}
UserPolicySigninService::~UserPolicySigninService() {}
void UserPolicySigninService::RegisterForPolicy(
const std::string& username,
+ const std::string& access_token,
PolicyRegistrationBlockCallback callback) {
// Create a new CloudPolicyClient for fetching the DMToken.
scoped_ptr<CloudPolicyClient> policy_client = CreateClientForRegistrationOnly(
@@ -75,13 +73,17 @@ void UserPolicySigninService::RegisterForPolicy(
registration_helper_.reset(new CloudPolicyClientRegistrationHelper(
policy_client.get(),
GetRegistrationType()));
- registration_helper_->StartRegistration(
- oauth2_token_service_,
- username,
- base::Bind(&UserPolicySigninService::CallPolicyRegistrationCallback,
- base::Unretained(this),
- base::Passed(&policy_client),
- [callback copy]));
+ registration_helper_->StartRegistrationWithAccessToken(
+ access_token,
+ base::Bind(&UserPolicySigninService::CallPolicyRegistrationCallback,
+ base::Unretained(this),
+ base::Passed(&policy_client),
+ [callback copy]));
+}
+
+// static
+std::vector<std::string> UserPolicySigninService::GetScopes() {
+ return CloudPolicyClientRegistrationHelper::GetScopes();
}
void UserPolicySigninService::FetchPolicy(

Powered by Google App Engine
This is Rietveld 408576698