Improve accessibility of user image selection screen.

chrome/browser/chromeos/login/default_user_images.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/chromeos/login/default_user_images.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace chromeos {
 
 namespace {
 
 const char kDefaultPathPrefix[] = "default:";
 const char kDefaultUrlPrefix[] = "chrome://theme/IDR_LOGIN_DEFAULT_USER_";
 const char kZeroDefaultUrl[] = "chrome://theme/IDR_LOGIN_DEFAULT_USER";
 
 const char* kOldDefaultImageNames[] = {
   "default:gray",
   "default:green",
   "default:blue",
   "default:yellow",
   "default:red",
 };
 
+// IDs of default user image descriptions.
+const int kDefaultImageDescriptions[] = {
+  0,  // No description for deprecated user image 0.
+  0,  // No description for deprecated user image 1.
+  0,  // No description for deprecated user image 2.
+  0,  // No description for deprecated user image 3.
+  0,  // No description for deprecated user image 4.
+  0,  // No description for deprecated user image 5.
+  0,  // No description for deprecated user image 6.
+  0,  // No description for deprecated user image 7.
+  0,  // No description for deprecated user image 8.
+  0,  // No description for deprecated user image 9.
+  0,  // No description for deprecated user image 10.
+  0,  // No description for deprecated user image 11.
+  0,  // No description for deprecated user image 12.
+  0,  // No description for deprecated user image 13.
+  0,  // No description for deprecated user image 14.
+  0,  // No description for deprecated user image 15.
+  0,  // No description for deprecated user image 16.
+  0,  // No description for deprecated user image 17.
+  0,  // No description for deprecated user image 18.
+  IDS_LOGIN_DEFAULT_USER_DESC_19,
+  IDS_LOGIN_DEFAULT_USER_DESC_20,
+  IDS_LOGIN_DEFAULT_USER_DESC_21,
+  IDS_LOGIN_DEFAULT_USER_DESC_22,
+  IDS_LOGIN_DEFAULT_USER_DESC_23,
+  IDS_LOGIN_DEFAULT_USER_DESC_24,
+  IDS_LOGIN_DEFAULT_USER_DESC_25,
+  IDS_LOGIN_DEFAULT_USER_DESC_26,
+  IDS_LOGIN_DEFAULT_USER_DESC_27,
+  IDS_LOGIN_DEFAULT_USER_DESC_28,
+  IDS_LOGIN_DEFAULT_USER_DESC_29,
+  IDS_LOGIN_DEFAULT_USER_DESC_30,
+  IDS_LOGIN_DEFAULT_USER_DESC_31,
+  IDS_LOGIN_DEFAULT_USER_DESC_32,
+};
+
 // Returns a string consisting of the prefix specified and the index of the
 // image if its valid.
 std::string GetDefaultImageString(int index, const std::string& prefix) {
   if (index < 0 || index >= kDefaultImagesCount) {
     NOTREACHED();
     return std::string();
   }
   return StringPrintf("%s%d", prefix.c_str(), index);
 }
 
@@ skipping 52 matching lines @@
   }
   return IsDefaultImageString(url, kDefaultUrlPrefix, image_id);
 }
 
 const gfx::ImageSkia& GetDefaultImage(int index) {
   DCHECK(index >= 0 && index < kDefaultImagesCount);
   return *ResourceBundle::GetSharedInstance().
       GetImageSkiaNamed(kDefaultImageResourceIDs[index]);
 }
 
+string16 GetDefaultImageDescription(int index) {
+  DCHECK(index >= 0 && index < kDefaultImagesCount);
+  int string_id = kDefaultImageDescriptions[index];
+  if (string_id)
+    return l10n_util::GetStringUTF16(string_id);
+  else
+    return string16();
+}
+
+// Resource IDs of default user images.
 const int kDefaultImageResourceIDs[] = {
   IDR_LOGIN_DEFAULT_USER,
   IDR_LOGIN_DEFAULT_USER_1,
   IDR_LOGIN_DEFAULT_USER_2,
   IDR_LOGIN_DEFAULT_USER_3,
   IDR_LOGIN_DEFAULT_USER_4,
   IDR_LOGIN_DEFAULT_USER_5,
   IDR_LOGIN_DEFAULT_USER_6,
   IDR_LOGIN_DEFAULT_USER_7,
   IDR_LOGIN_DEFAULT_USER_8,
@@ skipping 112 matching lines @@
 int GetDefaultImageHistogramValue(int index) {
   DCHECK(index >= 0 && index < kDefaultImagesCount);
   // Create a gap in histogram values for
   // [kHistogramImageFromCamera..kHistogramImageFromProfile] block to fit.
   if (index < kHistogramImageFromCamera)
     return index;
   return index + 6;
 }
 
 }  // namespace chromeos