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

Side by Side Diff: chrome/browser/profiles/profile_avatar_icon_util.cc

Issue 2066093003: Refactor fetching profile avatar icons and labels repeated md-settings & md-user-manager (C++) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@avatar-selector-refactor
Patch Set: Addressed comments Created 4 years, 6 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 "chrome/browser/profiles/profile_avatar_icon_util.h" 5 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/format_macros.h" 11 #include "base/format_macros.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/strings/string_split.h" 15 #include "base/strings/string_split.h"
16 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
17 #include "base/values.h"
17 #include "chrome/browser/browser_process.h" 18 #include "chrome/browser/browser_process.h"
18 #include "chrome/common/chrome_paths.h" 19 #include "chrome/common/chrome_paths.h"
19 #include "chrome/grit/generated_resources.h" 20 #include "chrome/grit/generated_resources.h"
20 #include "grit/theme_resources.h" 21 #include "grit/theme_resources.h"
21 #include "skia/ext/image_operations.h" 22 #include "skia/ext/image_operations.h"
22 #include "third_party/skia/include/core/SkPaint.h" 23 #include "third_party/skia/include/core/SkPaint.h"
23 #include "third_party/skia/include/core/SkPath.h" 24 #include "third_party/skia/include/core/SkPath.h"
24 #include "third_party/skia/include/core/SkScalar.h" 25 #include "third_party/skia/include/core/SkScalar.h"
25 #include "third_party/skia/include/core/SkXfermode.h" 26 #include "third_party/skia/include/core/SkXfermode.h"
27 #include "ui/base/l10n/l10n_util.h"
26 #include "ui/base/resource/resource_bundle.h" 28 #include "ui/base/resource/resource_bundle.h"
27 #include "ui/gfx/canvas.h" 29 #include "ui/gfx/canvas.h"
28 #include "ui/gfx/geometry/rect.h" 30 #include "ui/gfx/geometry/rect.h"
29 #include "ui/gfx/image/canvas_image_source.h" 31 #include "ui/gfx/image/canvas_image_source.h"
30 #include "ui/gfx/image/image.h" 32 #include "ui/gfx/image/image.h"
31 #include "ui/gfx/image/image_skia_operations.h" 33 #include "ui/gfx/image/image_skia_operations.h"
32 #include "ui/gfx/skia_util.h" 34 #include "ui/gfx/skia_util.h"
33 #include "url/gurl.h" 35 #include "url/gurl.h"
34 #include "url/url_canon.h" 36 #include "url/url_canon.h"
35 37
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 replacement.SetPathStr(new_path.c_str()); 488 replacement.SetPathStr(new_path.c_str());
487 *new_url = old_url.ReplaceComponents(replacement); 489 *new_url = old_url.ReplaceComponents(replacement);
488 return new_url->is_valid(); 490 return new_url->is_valid();
489 } 491 }
490 492
491 // We can't set the image size, just use the default size. 493 // We can't set the image size, just use the default size.
492 *new_url = old_url; 494 *new_url = old_url;
493 return true; 495 return true;
494 } 496 }
495 497
498 std::unique_ptr<base::ListValue> GetDefaultProfileAvatarIconsAndLabels() {
499 std::unique_ptr<base::ListValue> avatars(new base::ListValue());
500
501 size_t placeholder_avatar_index = profiles::GetPlaceholderAvatarIndex();
Mike Lerman 2016/06/20 00:42:53 nit: const
Moe 2016/06/20 17:24:08 Done.
502 for (size_t i = 0; i < profiles::GetDefaultAvatarIconCount() &&
503 i != placeholder_avatar_index;
Mike Lerman 2016/06/20 00:42:53 nit: ++i
Moe 2016/06/20 17:24:08 Done.
504 i++) {
505 std::unique_ptr<base::DictionaryValue> avatar_info(
506 new base::DictionaryValue());
507 avatar_info->SetString("url", profiles::GetDefaultAvatarIconUrl(i));
508 avatar_info->SetString(
509 "label", l10n_util::GetStringUTF16(
510 profiles::GetDefaultAvatarLabelResourceIDAtIndex(i)));
511
512 avatars->Append(std::move(avatar_info));
513 }
514 return avatars;
515 }
516
496 } // namespace profiles 517 } // namespace profiles
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698