Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2381)

Unified Diff: chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc

Issue 10850036: [cros] Add attribution (author & website) strings to stock user images. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Compile fix Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc
diff --git a/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc
index 05f512c15117fb9e5484a0279d1ecb53e4128679..f45373f770a1eae5d5e087344849532111d4bbec 100644
--- a/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc
@@ -105,6 +105,8 @@ void ChangePictureOptionsHandler::GetLocalizedValues(
IDS_OPTIONS_CHANGE_PICTURE_PROFILE_LOADING_PHOTO));
localized_strings->SetString("previewAltText",
l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE_PREVIEW_ALT));
+ localized_strings->SetString("authorCredit",
+ l10n_util::GetStringUTF16(IDS_OPTIONS_SET_WALLPAPER_AUTHOR_TEXT));
if (!CommandLine::ForCurrentProcess()->
HasSwitch(switches::kDisableHtml5Camera)) {
localized_strings->SetString("cameraType", "webrtc");
@@ -135,9 +137,15 @@ void ChangePictureOptionsHandler::RegisterMessages() {
}
void ChangePictureOptionsHandler::SendDefaultImages() {
- ListValue image_urls;
+ base::ListValue image_urls;
for (int i = kFirstDefaultImageIndex; i < kDefaultImagesCount; ++i) {
- image_urls.Append(new StringValue(GetDefaultImageUrl(i)));
+ scoped_ptr<base::DictionaryValue> image_data(new base::DictionaryValue);
+ image_data->SetString("url", GetDefaultImageUrl(i));
+ image_data->SetString(
+ "author", l10n_util::GetStringUTF16(kDefaultImageAuthorIDs[i]));
+ image_data->SetString(
+ "website", l10n_util::GetStringUTF16(kDefaultImageWebsiteIDs[i]));
+ image_urls.Append(image_data.release());
}
web_ui()->CallJavascriptFunction("ChangePictureOptions.setDefaultImages",
image_urls);

Powered by Google App Engine
This is Rietveld 408576698