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

Side by Side Diff: chrome/browser/ui/ash/user_accounts_delegate_chromeos.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/ui/ash/user_accounts_delegate_chromeos.h" 5 #include "chrome/browser/ui/ash/user_accounts_delegate_chromeos.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "chrome/browser/chromeos/profiles/profile_helper.h" 11 #include "chrome/browser/chromeos/profiles/profile_helper.h"
12 #include "chrome/browser/chromeos/ui/inline_login_dialog.h" 12 #include "chrome/browser/chromeos/ui/inline_login_dialog.h"
13 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 13 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
14 #include "chrome/browser/signin/signin_manager_factory.h" 14 #include "chrome/browser/signin/signin_manager_factory.h"
15 #include "components/signin/core/browser/mutable_profile_oauth2_token_service.h" 15 #include "components/signin/core/browser/mutable_profile_oauth2_token_service.h"
16 #include "components/signin/core/browser/profile_oauth2_token_service.h" 16 #include "components/signin/core/browser/profile_oauth2_token_service.h"
17 #include "components/signin/core/browser/signin_manager.h" 17 #include "components/signin/core/browser/signin_manager.h"
18 #include "components/user_manager/user.h" 18 #include "components/user_manager/user.h"
19 #include "components/user_manager/user_id.h"
19 #include "google_apis/gaia/gaia_auth_util.h" 20 #include "google_apis/gaia/gaia_auth_util.h"
20 21
21 namespace chromeos { 22 namespace chromeos {
22 23
23 UserAccountsDelegateChromeOS::UserAccountsDelegateChromeOS( 24 UserAccountsDelegateChromeOS::UserAccountsDelegateChromeOS(
24 Profile* user_profile) 25 Profile* user_profile)
25 : user_profile_(user_profile) { 26 : user_profile_(user_profile) {
26 ProfileOAuth2TokenServiceFactory::GetForProfile(user_profile_) 27 ProfileOAuth2TokenServiceFactory::GetForProfile(user_profile_)
27 ->AddObserver(this); 28 ->AddObserver(this);
28 } 29 }
(...skipping 20 matching lines...) Expand all
49 << "Found " << std::distance(it, accounts.end()) 50 << "Found " << std::distance(it, accounts.end())
50 << " primary accounts in the account list."; 51 << " primary accounts in the account list.";
51 accounts.erase(it, accounts.end()); 52 accounts.erase(it, accounts.end());
52 return accounts; 53 return accounts;
53 } 54 }
54 55
55 std::string UserAccountsDelegateChromeOS::GetAccountDisplayName( 56 std::string UserAccountsDelegateChromeOS::GetAccountDisplayName(
56 const std::string& account_id) { 57 const std::string& account_id) {
57 const user_manager::User* user = 58 const user_manager::User* user =
58 ProfileHelper::Get()->GetUserByProfile(user_profile_); 59 ProfileHelper::Get()->GetUserByProfile(user_profile_);
59 if (gaia::AreEmailsSame(user->email(), account_id) && 60 if (gaia::AreEmailsSame(user->GetUserID().GetUserEmail(), account_id) &&
60 !user->display_email().empty()) 61 !user->display_email().empty())
61 return user->display_email(); 62 return user->display_email();
62 return account_id; 63 return account_id;
63 } 64 }
64 65
65 void UserAccountsDelegateChromeOS::DeleteAccount( 66 void UserAccountsDelegateChromeOS::DeleteAccount(
66 const std::string& account_id) { 67 const std::string& account_id) {
67 MutableProfileOAuth2TokenService* oauth2_token_service = 68 MutableProfileOAuth2TokenService* oauth2_token_service =
68 ProfileOAuth2TokenServiceFactory::GetPlatformSpecificForProfile( 69 ProfileOAuth2TokenServiceFactory::GetPlatformSpecificForProfile(
69 user_profile_); 70 user_profile_);
70 oauth2_token_service->RevokeCredentials(account_id); 71 oauth2_token_service->RevokeCredentials(account_id);
71 } 72 }
72 73
73 void UserAccountsDelegateChromeOS::LaunchAddAccountDialog() { 74 void UserAccountsDelegateChromeOS::LaunchAddAccountDialog() {
74 ui::InlineLoginDialog::Show(user_profile_); 75 ui::InlineLoginDialog::Show(user_profile_);
75 } 76 }
76 77
77 void UserAccountsDelegateChromeOS::OnRefreshTokenAvailable( 78 void UserAccountsDelegateChromeOS::OnRefreshTokenAvailable(
78 const std::string& account_id) { 79 const std::string& account_id) {
79 NotifyAccountListChanged(); 80 NotifyAccountListChanged();
80 } 81 }
81 82
82 void UserAccountsDelegateChromeOS::OnRefreshTokenRevoked( 83 void UserAccountsDelegateChromeOS::OnRefreshTokenRevoked(
83 const std::string& account_id) { 84 const std::string& account_id) {
84 NotifyAccountListChanged(); 85 NotifyAccountListChanged();
85 } 86 }
86 87
87 } // namespace chromeos 88 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698