Improve accessibility of user image selection screen.

chrome/browser/chromeos/login/default_user_images.cc

Index: chrome/browser/chromeos/login/default_user_images.cc
diff --git a/chrome/browser/chromeos/login/default_user_images.cc b/chrome/browser/chromeos/login/default_user_images.cc
index e015c5aadd88364c07511659043fa755187c4335..bd3bf077364965781a9769bf8b8a85675a784ab6 100644
--- a/chrome/browser/chromeos/login/default_user_images.cc
+++ b/chrome/browser/chromeos/login/default_user_images.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -10,8 +10,10 @@
 #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 {
@@ -102,6 +104,34 @@ const gfx::ImageSkia& GetDefaultImage(int index) {
       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,