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 41e53b5069cc9d88b7d424e12d6cc09b8b61111b..7d2f3c7611a169037825f6397d4e4ad8bd3ee0fa 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 = 0; i < kDefaultImagesCount; ++i) { |
- image_urls.Append(new StringValue(GetDefaultImageUrl(i))); |
+ DictionaryValue* dict = new DictionaryValue(); |
Ivan Korotkov
2012/08/03 01:00:23
Please use base::, scoped_ptr and release:
scoped_
dmazzoni
2012/08/03 22:59:01
Nice, thanks.
|
+ dict->Set("url", new StringValue(GetDefaultImageUrl(i))); |
+ dict->Set("title", new StringValue(GetDefaultImageDescription(i))); |
Ivan Korotkov
2012/08/03 01:00:23
Use dict->SetString
dmazzoni
2012/08/03 22:59:01
Done.
|
+ image_urls.Append(dict); |
} |
web_ui()->CallJavascriptFunction("oobe.UserImageScreen.setUserImages", |
image_urls); |