Improve accessibility of user image selection screen.

chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 43 matching lines @@
 void UserImageScreenHandler::GetLocalizedStrings(
     DictionaryValue *localized_strings) {
   // TODO(ivankr): string should be renamed to something like
   // IDS_USER_IMAGE_SCREEN_TITLE (currently used for Take Photo dialog).
   localized_strings->SetString("userImageScreenTitle",
       l10n_util::GetStringUTF16(IDS_OOBE_PICTURE));
   localized_strings->SetString("userImageScreenDescription",
       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",
       l10n_util::GetStringUTF16(IDS_IMAGE_SCREEN_PROFILE_LOADING_PHOTO));
   localized_strings->SetString("okButtonText",
       l10n_util::GetStringUTF16(IDS_OK));
   if (!CommandLine::ForCurrentProcess()->
           HasSwitch(switches::kDisableHtml5Camera)) {
     localized_strings->SetString("cameraType", "webrtc");
   } else {
     localized_strings->SetString("cameraType", "old");
   }
 }
 
 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_ptr<base::DictionaryValue> image_info(new base::DictionaryValue);
....
image_urls.Append(image_info.release());

[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);
 
   if (selected_image_ != User::kInvalidImageIndex)
     SelectImage(selected_image_);
 
   if (profile_picture_data_url_ != chrome::kAboutBlankURL)
     SendProfileImage(profile_picture_data_url_);
   else if (profile_picture_absent_)
@@ skipping 201 matching lines @@
   user_photo_ = gfx::ImageSkia(decoded_image);
   if (screen_ && accept_photo_after_decoding_)
     screen_->OnPhotoTaken(user_photo_);
 }
 
 void UserImageScreenHandler::OnDecodeImageFailed(const ImageDecoder* decoder) {
   NOTREACHED() << "Failed to decode PNG image from WebUI";
 }
 
 }  // namespace chromeos