Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Side by Side Diff: components/user_manager/user_image/default_user_images.cc

Issue 920813002: chromeos: Cats avatar added to defaults set. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments addressed. Created 5 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/user_manager/user_image/default_user_images.h" 5 #include "components/user_manager/user_image/default_user_images.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/string_piece.h" 10 #include "base/strings/string_piece.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 IDS_LOGIN_DEFAULT_USER_DESC_23, 52 IDS_LOGIN_DEFAULT_USER_DESC_23,
53 IDS_LOGIN_DEFAULT_USER_DESC_24, 53 IDS_LOGIN_DEFAULT_USER_DESC_24,
54 IDS_LOGIN_DEFAULT_USER_DESC_25, 54 IDS_LOGIN_DEFAULT_USER_DESC_25,
55 IDS_LOGIN_DEFAULT_USER_DESC_26, 55 IDS_LOGIN_DEFAULT_USER_DESC_26,
56 IDS_LOGIN_DEFAULT_USER_DESC_27, 56 IDS_LOGIN_DEFAULT_USER_DESC_27,
57 IDS_LOGIN_DEFAULT_USER_DESC_28, 57 IDS_LOGIN_DEFAULT_USER_DESC_28,
58 IDS_LOGIN_DEFAULT_USER_DESC_29, 58 IDS_LOGIN_DEFAULT_USER_DESC_29,
59 IDS_LOGIN_DEFAULT_USER_DESC_30, 59 IDS_LOGIN_DEFAULT_USER_DESC_30,
60 IDS_LOGIN_DEFAULT_USER_DESC_31, 60 IDS_LOGIN_DEFAULT_USER_DESC_31,
61 IDS_LOGIN_DEFAULT_USER_DESC_32, 61 IDS_LOGIN_DEFAULT_USER_DESC_32,
62 IDS_LOGIN_DEFAULT_USER_DESC_33,
62 }; 63 };
63 64
64 // Returns a string consisting of the prefix specified and the index of the 65 // Returns a string consisting of the prefix specified and the index of the
65 // image if its valid. 66 // image if its valid.
66 std::string GetDefaultImageString(int index, const std::string& prefix) { 67 std::string GetDefaultImageString(int index, const std::string& prefix) {
67 if (index < 0 || index >= kDefaultImagesCount) { 68 if (index < 0 || index >= kDefaultImagesCount) {
68 DCHECK(!base::SysInfo::IsRunningOnChromeOS()); 69 DCHECK(!base::SysInfo::IsRunningOnChromeOS());
69 return std::string(); 70 return std::string();
70 } 71 }
71 return base::StringPrintf("%s%d", prefix.c_str(), index); 72 return base::StringPrintf("%s%d", prefix.c_str(), index);
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 IDR_LOGIN_DEFAULT_USER_23, 152 IDR_LOGIN_DEFAULT_USER_23,
152 IDR_LOGIN_DEFAULT_USER_24, 153 IDR_LOGIN_DEFAULT_USER_24,
153 IDR_LOGIN_DEFAULT_USER_25, 154 IDR_LOGIN_DEFAULT_USER_25,
154 IDR_LOGIN_DEFAULT_USER_26, 155 IDR_LOGIN_DEFAULT_USER_26,
155 IDR_LOGIN_DEFAULT_USER_27, 156 IDR_LOGIN_DEFAULT_USER_27,
156 IDR_LOGIN_DEFAULT_USER_28, 157 IDR_LOGIN_DEFAULT_USER_28,
157 IDR_LOGIN_DEFAULT_USER_29, 158 IDR_LOGIN_DEFAULT_USER_29,
158 IDR_LOGIN_DEFAULT_USER_30, 159 IDR_LOGIN_DEFAULT_USER_30,
159 IDR_LOGIN_DEFAULT_USER_31, 160 IDR_LOGIN_DEFAULT_USER_31,
160 IDR_LOGIN_DEFAULT_USER_32, 161 IDR_LOGIN_DEFAULT_USER_32,
162 IDR_LOGIN_DEFAULT_USER_33,
161 }; 163 };
162 164
163 const int kDefaultImageAuthorIDs[] = { 165 const int kDefaultImageAuthorIDs[] = {
164 IDS_LOGIN_DEFAULT_USER_AUTHOR, 166 IDS_LOGIN_DEFAULT_USER_AUTHOR,
165 IDS_LOGIN_DEFAULT_USER_AUTHOR_1, 167 IDS_LOGIN_DEFAULT_USER_AUTHOR_1,
166 IDS_LOGIN_DEFAULT_USER_AUTHOR_2, 168 IDS_LOGIN_DEFAULT_USER_AUTHOR_2,
167 IDS_LOGIN_DEFAULT_USER_AUTHOR_3, 169 IDS_LOGIN_DEFAULT_USER_AUTHOR_3,
168 IDS_LOGIN_DEFAULT_USER_AUTHOR_4, 170 IDS_LOGIN_DEFAULT_USER_AUTHOR_4,
169 IDS_LOGIN_DEFAULT_USER_AUTHOR_5, 171 IDS_LOGIN_DEFAULT_USER_AUTHOR_5,
170 IDS_LOGIN_DEFAULT_USER_AUTHOR_6, 172 IDS_LOGIN_DEFAULT_USER_AUTHOR_6,
(...skipping 16 matching lines...) Expand all
187 IDS_LOGIN_DEFAULT_USER_AUTHOR_23, 189 IDS_LOGIN_DEFAULT_USER_AUTHOR_23,
188 IDS_LOGIN_DEFAULT_USER_AUTHOR_24, 190 IDS_LOGIN_DEFAULT_USER_AUTHOR_24,
189 IDS_LOGIN_DEFAULT_USER_AUTHOR_25, 191 IDS_LOGIN_DEFAULT_USER_AUTHOR_25,
190 IDS_LOGIN_DEFAULT_USER_AUTHOR_26, 192 IDS_LOGIN_DEFAULT_USER_AUTHOR_26,
191 IDS_LOGIN_DEFAULT_USER_AUTHOR_27, 193 IDS_LOGIN_DEFAULT_USER_AUTHOR_27,
192 IDS_LOGIN_DEFAULT_USER_AUTHOR_28, 194 IDS_LOGIN_DEFAULT_USER_AUTHOR_28,
193 IDS_LOGIN_DEFAULT_USER_AUTHOR_29, 195 IDS_LOGIN_DEFAULT_USER_AUTHOR_29,
194 IDS_LOGIN_DEFAULT_USER_AUTHOR_30, 196 IDS_LOGIN_DEFAULT_USER_AUTHOR_30,
195 IDS_LOGIN_DEFAULT_USER_AUTHOR_31, 197 IDS_LOGIN_DEFAULT_USER_AUTHOR_31,
196 IDS_LOGIN_DEFAULT_USER_AUTHOR_32, 198 IDS_LOGIN_DEFAULT_USER_AUTHOR_32,
199 IDS_LOGIN_DEFAULT_USER_AUTHOR_33,
197 }; 200 };
198 201
199 const int kDefaultImageWebsiteIDs[] = { 202 const int kDefaultImageWebsiteIDs[] = {
200 IDS_LOGIN_DEFAULT_USER_WEBSITE, 203 IDS_LOGIN_DEFAULT_USER_WEBSITE,
201 IDS_LOGIN_DEFAULT_USER_WEBSITE_1, 204 IDS_LOGIN_DEFAULT_USER_WEBSITE_1,
202 IDS_LOGIN_DEFAULT_USER_WEBSITE_2, 205 IDS_LOGIN_DEFAULT_USER_WEBSITE_2,
203 IDS_LOGIN_DEFAULT_USER_WEBSITE_3, 206 IDS_LOGIN_DEFAULT_USER_WEBSITE_3,
204 IDS_LOGIN_DEFAULT_USER_WEBSITE_4, 207 IDS_LOGIN_DEFAULT_USER_WEBSITE_4,
205 IDS_LOGIN_DEFAULT_USER_WEBSITE_5, 208 IDS_LOGIN_DEFAULT_USER_WEBSITE_5,
206 IDS_LOGIN_DEFAULT_USER_WEBSITE_6, 209 IDS_LOGIN_DEFAULT_USER_WEBSITE_6,
(...skipping 16 matching lines...) Expand all
223 IDS_LOGIN_DEFAULT_USER_WEBSITE_23, 226 IDS_LOGIN_DEFAULT_USER_WEBSITE_23,
224 IDS_LOGIN_DEFAULT_USER_WEBSITE_24, 227 IDS_LOGIN_DEFAULT_USER_WEBSITE_24,
225 IDS_LOGIN_DEFAULT_USER_WEBSITE_25, 228 IDS_LOGIN_DEFAULT_USER_WEBSITE_25,
226 IDS_LOGIN_DEFAULT_USER_WEBSITE_26, 229 IDS_LOGIN_DEFAULT_USER_WEBSITE_26,
227 IDS_LOGIN_DEFAULT_USER_WEBSITE_27, 230 IDS_LOGIN_DEFAULT_USER_WEBSITE_27,
228 IDS_LOGIN_DEFAULT_USER_WEBSITE_28, 231 IDS_LOGIN_DEFAULT_USER_WEBSITE_28,
229 IDS_LOGIN_DEFAULT_USER_WEBSITE_29, 232 IDS_LOGIN_DEFAULT_USER_WEBSITE_29,
230 IDS_LOGIN_DEFAULT_USER_WEBSITE_30, 233 IDS_LOGIN_DEFAULT_USER_WEBSITE_30,
231 IDS_LOGIN_DEFAULT_USER_WEBSITE_31, 234 IDS_LOGIN_DEFAULT_USER_WEBSITE_31,
232 IDS_LOGIN_DEFAULT_USER_WEBSITE_32, 235 IDS_LOGIN_DEFAULT_USER_WEBSITE_32,
236 IDS_LOGIN_DEFAULT_USER_WEBSITE_33,
233 }; 237 };
234 238
235 const int kDefaultImagesCount = arraysize(kDefaultImageResourceIDs); 239 const int kDefaultImagesCount = arraysize(kDefaultImageResourceIDs);
236 240
237 const int kFirstDefaultImageIndex = 19; 241 const int kFirstDefaultImageIndex = 19;
238 242
239 // The order and the values of these constants are important for histograms 243 // The order and the values of these constants are important for histograms
240 // of different Chrome OS versions to be merged smoothly. 244 // of different Chrome OS versions to be merged smoothly.
241 const int kHistogramImageFromCamera = 19; 245 const int kHistogramImageFromCamera = 19;
242 const int kHistogramImageFromFile = 20; 246 const int kHistogramImageFromFile = 20;
243 const int kHistogramImageOld = 21; 247 const int kHistogramImageOld = 21;
244 const int kHistogramImageFromProfile = 22; 248 const int kHistogramImageFromProfile = 22;
245 const int kHistogramVideoFromCamera = 23; 249 const int kHistogramVideoFromCamera = 23;
246 const int kHistogramVideoFromFile = 24; 250 const int kHistogramVideoFromFile = 24;
247 const int kHistogramImagesCount = kDefaultImagesCount + 6; 251 const int kHistogramImagesCount = kDefaultImagesCount + 6;
248 252
249 int GetDefaultImageHistogramValue(int index) { 253 int GetDefaultImageHistogramValue(int index) {
250 DCHECK(index >= 0 && index < kDefaultImagesCount); 254 DCHECK(index >= 0 && index < kDefaultImagesCount);
251 // Create a gap in histogram values for 255 // Create a gap in histogram values for
252 // [kHistogramImageFromCamera..kHistogramImageFromProfile] block to fit. 256 // [kHistogramImageFromCamera..kHistogramImageFromProfile] block to fit.
253 if (index < kHistogramImageFromCamera) 257 if (index < kHistogramImageFromCamera)
254 return index; 258 return index;
255 return index + 6; 259 return index + 6;
256 } 260 }
257 261
258 } // namespace user_manager 262 } // namespace user_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698