Improve accessibility of user image selection screen.

chrome/browser/chromeos/login/default_user_images.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 kFirstDefaultUrl[] = "chrome://theme/IDR_LOGIN_DEFAULT_USER";
 
@@ skipping 70 matching lines @@
   }
   return IsDefaultImageString(url, kDefaultUrlPrefix, image_id);
 }
 
 const gfx::ImageSkia& GetDefaultImage(int index) {
   DCHECK(index >= 0 && index < kDefaultImagesCount);
   return *ResourceBundle::GetSharedInstance().
       GetImageSkiaNamed(kDefaultImageResources[index]);
 }
 
+// IDs of default user image descriptions.

[Ivan Korotkov, 2012/08/03 01:00:23]

// String IDs...

[dmazzoni, 2012/08/03 22:59:01]

Done.

+const int kDefaultImageDescriptions[] = {
+  IDS_LOGIN_DEFAULT_USER,
+  IDS_LOGIN_DEFAULT_USER_1,
+  IDS_LOGIN_DEFAULT_USER_2,
+  IDS_LOGIN_DEFAULT_USER_3,
+  IDS_LOGIN_DEFAULT_USER_4,
+  IDS_LOGIN_DEFAULT_USER_5,
+  IDS_LOGIN_DEFAULT_USER_6,
+  IDS_LOGIN_DEFAULT_USER_7,
+  IDS_LOGIN_DEFAULT_USER_8,
+  IDS_LOGIN_DEFAULT_USER_9,
+  IDS_LOGIN_DEFAULT_USER_10,
+  IDS_LOGIN_DEFAULT_USER_11,
+  IDS_LOGIN_DEFAULT_USER_12,
+  IDS_LOGIN_DEFAULT_USER_13,
+  IDS_LOGIN_DEFAULT_USER_14,
+  IDS_LOGIN_DEFAULT_USER_15,
+  IDS_LOGIN_DEFAULT_USER_16,
+  IDS_LOGIN_DEFAULT_USER_17,
+  IDS_LOGIN_DEFAULT_USER_18,
+};
+
+std::string GetDefaultImageDescription(int index) {

[Ivan Korotkov, 2012/08/03 01:00:23]

Should be string16 and GetStringUTF16.
I actually suggest to remove the function and call GetStringUTF16 directly from
the caller site but that's up to you. If not, move kDefaultImageDescriptions to
a anonymous namespace.

[dmazzoni, 2012/08/03 22:59:01]

Hmmm, I think it's better to have the constants in this file so that somebody
modifying kDefaultImageResources would also modify 
kDefaultImageDescriptions. Moved to anonymous namespace.

+  DCHECK(index >= 0 && index < kDefaultImagesCount);
+  return l10n_util::GetStringUTF8(kDefaultImageDescriptions[index]);
+}
+
 // Resource IDs of default user images.
 const int kDefaultImageResources[] = {
   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,
@@ skipping 14 matching lines @@
 
 // The order and the values of these constants are important for histograms
 // of different Chrome OS versions to be merged smoothly.
 const int kHistogramImageFromCamera = kDefaultImagesCount;
 const int kHistogramImageFromFile = kDefaultImagesCount + 1;
 const int kHistogramImageOld = kDefaultImagesCount + 2;
 const int kHistogramImageFromProfile = kDefaultImagesCount + 3;
 const int kHistogramImagesCount = kDefaultImagesCount + 4;
 
 }  // namespace chromeos