chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc - Issue 10850036: [cros] Add attribution (author & website) strings to stock user images.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/chromeos/login/user_image_screen_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: Merge 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

« no previous file with comments | « chrome/browser/resources/options2/chromeos/set_wallpaper_options.js ('k') | chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..3f490ef1bed21c5814256342a18236ef89e78d47 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

@@ -67,6 +67,8 @@ void UserImageScreenHandler::GetLocalizedStrings(

l10n_util::GetStringUTF16(IDS_IMAGE_SCREEN_PROFILE_LOADING_PHOTO));

localized_strings->SetString("okButtonText",

l10n_util::GetStringUTF16(IDS_OK));

+ localized_strings->SetString("authorCredit",

+ l10n_util::GetStringUTF16(IDS_OPTIONS_SET_WALLPAPER_AUTHOR_TEXT));

if (!CommandLine::ForCurrentProcess()->

HasSwitch(switches::kDisableHtml5Camera)) {

localized_strings->SetString("cameraType", "webrtc");

@@ -76,11 +78,17 @@ void UserImageScreenHandler::GetLocalizedStrings(

}

void UserImageScreenHandler::Initialize() {

- 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("oobe.UserImageScreen.setUserImages",

+ web_ui()->CallJavascriptFunction("oobe.UserImageScreen.setDefaultImages",

image_urls);

if (selected_image_ != User::kInvalidImageIndex)