From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Mon, 12 Feb 2018 21:29:30 +0100 Subject: ungoogled-chromium: Disable profile avatar Added some Bromite-specific further improvements License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/browser/BUILD.gn | 2 -- chrome/browser/profiles/profile_attributes_entry.cc | 6 ------ chrome/browser/profiles/profile_attributes_storage.cc | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -1463,8 +1463,6 @@ static_library("browser") { "profiles/profile_attributes_storage.cc", "profiles/profile_attributes_storage.h", "profiles/profile_attributes_storage_observer.h", - "profiles/profile_avatar_downloader.cc", - "profiles/profile_avatar_downloader.h", "profiles/profile_avatar_icon_util.cc", "profiles/profile_avatar_icon_util.h", "profiles/profile_destroyer.cc", diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc --- a/chrome/browser/profiles/profile_attributes_entry.cc +++ b/chrome/browser/profiles/profile_attributes_entry.cc @@ -329,12 +329,6 @@ std::u16string ProfileAttributesEntry::GetUserName() const { gfx::Image ProfileAttributesEntry::GetAvatarIcon( int size_for_placeholder_avatar, bool use_high_res_file) const { - if (IsUsingGAIAPicture()) { - const gfx::Image* image = GetGAIAPicture(); - if (image) - return *image; - } - #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) // TODO(crbug.com/1100835): After launch, remove the treatment of placeholder // avatars from GetHighResAvatar() and from any other places. diff --git a/chrome/browser/profiles/profile_attributes_storage.cc b/chrome/browser/profiles/profile_attributes_storage.cc --- a/chrome/browser/profiles/profile_attributes_storage.cc +++ b/chrome/browser/profiles/profile_attributes_storage.cc @@ -998,7 +998,7 @@ void ProfileAttributesStorage::DownloadHighResAvatarIfNeeded( void ProfileAttributesStorage::DownloadHighResAvatar( size_t icon_index, const base::FilePath& profile_path) { -#if !BUILDFLAG(IS_ANDROID) +#if false const char* file_name = profiles::GetDefaultAvatarIconFileNameAtIndex(icon_index); DCHECK(file_name); -- 2.25.1