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

Side by Side Diff: chrome/browser/supervised_user/legacy/supervised_user_registration_utility_stub.cc

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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/supervised_user/legacy/supervised_user_registration_uti lity_stub.h" 5 #include "chrome/browser/supervised_user/legacy/supervised_user_registration_uti lity_stub.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "components/user_manager/user_id.h"
10 #include "google_apis/gaia/gaia_urls.h" 11 #include "google_apis/gaia/gaia_urls.h"
11 #include "google_apis/gaia/google_service_auth_error.h" 12 #include "google_apis/gaia/google_service_auth_error.h"
12 13
13 SupervisedUserRegistrationUtilityStub::SupervisedUserRegistrationUtilityStub() 14 SupervisedUserRegistrationUtilityStub::SupervisedUserRegistrationUtilityStub()
14 : register_was_called_(false) { 15 : register_was_called_(false), supervised_user_id_(std::string(), std::strin g()) {
15 } 16 }
16 17
17 SupervisedUserRegistrationUtilityStub:: 18 SupervisedUserRegistrationUtilityStub::
18 ~SupervisedUserRegistrationUtilityStub() { 19 ~SupervisedUserRegistrationUtilityStub() {
19 } 20 }
20 21
21 void SupervisedUserRegistrationUtilityStub::Register( 22 void SupervisedUserRegistrationUtilityStub::Register(
22 const std::string& supervised_user_id, 23 const user_manager::UserID& supervised_user_id,
23 const SupervisedUserRegistrationInfo& info, 24 const SupervisedUserRegistrationInfo& info,
24 const RegistrationCallback& callback) { 25 const RegistrationCallback& callback) {
25 DCHECK(!register_was_called_); 26 DCHECK(!register_was_called_);
26 register_was_called_ = true; 27 register_was_called_ = true;
27 callback_ = callback; 28 callback_ = callback;
28 supervised_user_id_ = supervised_user_id; 29 supervised_user_id_ = supervised_user_id;
29 display_name_ = info.name; 30 display_name_ = info.name;
30 master_key_ = info.master_key; 31 master_key_ = info.master_key;
31 } 32 }
32 33
33 void SupervisedUserRegistrationUtilityStub::RunSuccessCallback( 34 void SupervisedUserRegistrationUtilityStub::RunSuccessCallback(
34 const std::string& token) { 35 const std::string& token) {
35 if (callback_.is_null()) 36 if (callback_.is_null())
36 return; 37 return;
37 callback_.Run(GoogleServiceAuthError(GoogleServiceAuthError::NONE), token); 38 callback_.Run(GoogleServiceAuthError(GoogleServiceAuthError::NONE), token);
38 callback_.Reset(); 39 callback_.Reset();
39 } 40 }
40 41
41 void SupervisedUserRegistrationUtilityStub::RunFailureCallback( 42 void SupervisedUserRegistrationUtilityStub::RunFailureCallback(
42 const GoogleServiceAuthError::State state) { 43 const GoogleServiceAuthError::State state) {
43 if (callback_.is_null()) 44 if (callback_.is_null())
44 return; 45 return;
45 GoogleServiceAuthError error(state); 46 GoogleServiceAuthError error(state);
46 callback_.Run(error, std::string()); 47 callback_.Run(error, std::string());
47 callback_.Reset(); 48 callback_.Reset();
48 } 49 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698