| Index: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
|
| index 033203353a3ab950201d8232838e1146be4d6add..70c923227ebc111aede78cd04e441983a41c5460 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
|
| @@ -540,15 +540,15 @@ void GaiaScreenHandler::DoAdAuth(
|
| const std::string& username,
|
| const Key& key,
|
| authpolicy::ErrorType error,
|
| - const authpolicy::ActiveDirectoryAccountData& account_data) {
|
| + const authpolicy::ActiveDirectoryAccountInfo& account_info) {
|
| switch (error) {
|
| case authpolicy::ERROR_NONE: {
|
| - DCHECK(account_data.has_account_id() &&
|
| - !account_data.account_id().empty());
|
| + DCHECK(account_info.has_account_id() &&
|
| + !account_info.account_id().empty());
|
| const AccountId account_id(GetAccountId(
|
| - username, account_data.account_id(), AccountType::ACTIVE_DIRECTORY));
|
| - Delegate()->SetDisplayAndGivenName(account_data.display_name(),
|
| - account_data.given_name());
|
| + username, account_info.account_id(), AccountType::ACTIVE_DIRECTORY));
|
| + Delegate()->SetDisplayAndGivenName(account_info.display_name(),
|
| + account_info.given_name());
|
| UserContext user_context(account_id);
|
| user_context.SetKey(key);
|
| user_context.SetAuthFlow(UserContext::AUTH_FLOW_ACTIVE_DIRECTORY);
|
|
|