| Index: chrome/browser/ui/webui/options2/browser_options_handler2.cc
|
| diff --git a/chrome/browser/ui/webui/options2/browser_options_handler2.cc b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
|
| index 15bf0b1f2804cc1f6c305342bf3b2abef13b180e..8fbe5a0bba308daac0cf5082638bd6fe5d99bd33 100644
|
| --- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc
|
| +++ b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
|
| @@ -366,9 +366,9 @@ void BrowserOptionsHandler::GetLocalizedValues(
|
| l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
|
|
|
| #if defined(OS_CHROMEOS)
|
| - 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
|
|
|
| @@ -1040,7 +1040,7 @@ void BrowserOptionsHandler::ThemesSetGTK(const ListValue* args) {
|
|
|
| #if defined(OS_CHROMEOS)
|
| void BrowserOptionsHandler::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("BrowserOptions.updateAccountPicture");
|
| base::StringValue email_value(email);
|
|
|