38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc
|
|
index 515c1ae5234f6947b1b617d839597ba208d64144..bced0986e6fc741040532ffa3f144957311f3eae 100644
|
|
--- a/chrome/browser/profiles/profile_avatar_icon_util.cc
|
|
+++ b/chrome/browser/profiles/profile_avatar_icon_util.cc
|
|
@@ -460,7 +460,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1;
|
|
#elif BUILDFLAG(IS_CHROMEOS)
|
|
constexpr size_t kDefaultAvatarIconsCount = 27;
|
|
#else
|
|
-constexpr size_t kDefaultAvatarIconsCount = 56;
|
|
+constexpr size_t kDefaultAvatarIconsCount = 56 + kBraveDefaultAvatarIconsCount;
|
|
#endif
|
|
|
|
#if !BUILDFLAG(IS_ANDROID)
|
|
@@ -626,6 +626,7 @@ size_t GetPlaceholderAvatarIndex() {
|
|
|
|
size_t GetModernAvatarIconStartIndex() {
|
|
#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
|
|
+ BRAVE_GET_MODERN_AVATAR_ICON_START_INDEX
|
|
return GetPlaceholderAvatarIndex() + 1;
|
|
#else
|
|
// Only use the placeholder avatar on ChromeOS and Android.
|
|
@@ -659,6 +660,7 @@ std::string GetPlaceholderAvatarIconUrl() {
|
|
|
|
const IconResourceInfo* GetDefaultAvatarIconResourceInfo(size_t index) {
|
|
CHECK_LT(index, kDefaultAvatarIconsCount);
|
|
+ BRAVE_GET_DEFAULT_AVATAR_ICON_RESOURCE_INFO
|
|
static const std::array<IconResourceInfo, kDefaultAvatarIconsCount>
|
|
resource_info = {{
|
|
// Old avatar icons:
|
|
@@ -979,6 +981,7 @@ base::ListValue GetIconsAndLabelsForProfileAvatarSelector(
|
|
selected_avatar_idx == GetPlaceholderAvatarIndex());
|
|
avatars.Insert(avatars.begin(),
|
|
base::Value(std::move(generic_avatar_info)));
|
|
+ BRAVE_GET_ICONS_AND_LABELS_FOR_PROFILE_AVATAR_SELECTOR_NOT_SIGNED_IN
|
|
return avatars;
|
|
}
|
|
|