| Index: chrome/browser/ui/webui/options/personal_options_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/personal_options_handler.cc b/chrome/browser/ui/webui/options/personal_options_handler.cc
|
| index 57297c4a51fdf8ce26cea6c768a9f87f9c99fe3a..7764cd2594f7a521ea9f04f877377c1fd7620d3d 100644
|
| --- a/chrome/browser/ui/webui/options/personal_options_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/personal_options_handler.cc
|
| @@ -205,9 +205,9 @@ void PersonalOptionsHandler::GetLocalizedValues(
|
| l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX));
|
| localized_strings->SetString("changePicture",
|
| l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE));
|
| - if (chromeos::UserManager::Get()->user_is_logged_in()) {
|
| + if (chromeos::UserManager::Get()->IsUserLoggedIn()) {
|
| localized_strings->SetString("username",
|
| - chromeos::UserManager::Get()->logged_in_user().email());
|
| + chromeos::UserManager::Get()->GetLoggedInUser().email());
|
| }
|
| #endif
|
| }
|
| @@ -394,7 +394,7 @@ void PersonalOptionsHandler::ThemesSetGTK(const ListValue* args) {
|
|
|
| #if defined(OS_CHROMEOS)
|
| void PersonalOptionsHandler::UpdateAccountPicture() {
|
| - std::string email = chromeos::UserManager::Get()->logged_in_user().email();
|
| + std::string email = chromeos::UserManager::Get()->GetLoggedInUser().email();
|
| if (!email.empty()) {
|
| web_ui()->CallJavascriptFunction("PersonalOptions.updateAccountPicture");
|
| base::StringValue email_value(email);
|
|
|