| Index: chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.cc b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| index 68609e657cef6f24c09d7498a62dcfe01c783c67..a9b9ef6679e9d63ccfd0911b2fb7ddd00289cd0e 100644
|
| --- a/chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| +++ b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| @@ -23,6 +23,7 @@
|
| #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
|
| #include "components/proximity_auth/screenlock_bridge.h"
|
| #include "components/signin/core/account_id/account_id.h"
|
| +#include "components/user_manager/known_user.h"
|
| #include "components/user_manager/user_manager.h"
|
| #include "components/user_manager/user_type.h"
|
| #include "ui/base/user_activity/user_activity_detector.h"
|
| @@ -172,8 +173,7 @@ void UserSelectionScreen::FillUserDictionary(
|
| void UserSelectionScreen::FillKnownUserPrefs(user_manager::User* user,
|
| base::DictionaryValue* user_dict) {
|
| std::string gaia_id;
|
| - if (user_manager::UserManager::Get()->FindGaiaID(user->GetAccountId(),
|
| - &gaia_id)) {
|
| + if (user_manager::known_user::FindGaiaID(user->GetAccountId(), &gaia_id)) {
|
| user_dict->SetString(kKeyGaiaID, gaia_id);
|
| }
|
| }
|
| @@ -349,7 +349,7 @@ void UserSelectionScreen::SendUserList() {
|
| std::string owner_email;
|
| chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner,
|
| &owner_email);
|
| - const AccountId owner = user_manager::UserManager::GetKnownUserAccountId(
|
| + const AccountId owner = user_manager::known_user::GetKnownUserAccountId(
|
| owner_email, std::string());
|
|
|
| policy::BrowserPolicyConnectorChromeOS* connector =
|
| @@ -412,8 +412,7 @@ void UserSelectionScreen::CheckUserStatus(const AccountId& account_id) {
|
| return;
|
|
|
| if (!token_handle_util_.get()) {
|
| - token_handle_util_.reset(
|
| - new TokenHandleUtil(user_manager::UserManager::Get()));
|
| + token_handle_util_.reset(new TokenHandleUtil());
|
| }
|
|
|
| if (token_handle_util_->HasToken(account_id)) {
|
|
|