Index: chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc |
diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc |
index 7fc47bee1329ec68f351c129cf4535ebbb080489..460bb6c177fa9b5e9a4ffb7425cd7302ac08211b 100644 |
--- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc |
+++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc |
@@ -61,6 +61,10 @@ void UserImageScreenHandler::GetLocalizedStrings( |
l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE_DIALOG_TEXT)); |
localized_strings->SetString("takePhoto", |
l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE_TAKE_PHOTO)); |
+ localized_strings->SetString("discardPhoto", |
+ l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE_DISCARD_PHOTO)); |
+ localized_strings->SetString("flipPhoto", |
+ l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE_FLIP_PHOTO)); |
localized_strings->SetString("profilePhoto", |
l10n_util::GetStringUTF16(IDS_IMAGE_SCREEN_PROFILE_PHOTO)); |
localized_strings->SetString("profilePhotoLoading", |
@@ -78,7 +82,10 @@ void UserImageScreenHandler::GetLocalizedStrings( |
void UserImageScreenHandler::Initialize() { |
ListValue image_urls; |
for (int i = kFirstDefaultImageIndex; i < kDefaultImagesCount; ++i) { |
- image_urls.Append(new StringValue(GetDefaultImageUrl(i))); |
+ scoped_ptr<DictionaryValue> image_info(new DictionaryValue()); |
+ image_info->SetString("url", GetDefaultImageUrl(i)); |
+ image_info->SetString("title", GetDefaultImageDescription(i)); |
+ image_urls.Append(image_info.release()); |
} |
web_ui()->CallJavascriptFunction("oobe.UserImageScreen.setUserImages", |
image_urls); |