64 lines
2.7 KiB
Diff
64 lines
2.7 KiB
Diff
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
|
|
---
|
|
chrome/browser/BUILD.gn | 2 --
|
|
chrome/browser/profiles/profile_attributes_entry.cc | 6 ------
|
|
chrome/browser/profiles/profile_avatar_downloader.cc | 8 +-------
|
|
3 files changed, 1 insertion(+), 15 deletions(-)
|
|
|
|
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
|
--- a/chrome/browser/BUILD.gn
|
|
+++ b/chrome/browser/BUILD.gn
|
|
@@ -1423,8 +1423,6 @@ static_library("browser") {
|
|
"profiles/profile_attributes_entry.h",
|
|
"profiles/profile_attributes_storage.cc",
|
|
"profiles/profile_attributes_storage.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
|
|
@@ -285,12 +285,6 @@ base::string16 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;
|
|
- }
|
|
-
|
|
// TODO(crbug.com/1100835): After launch, remove the treatment of placeholder
|
|
// avatars from GetHighResAvatar() and from any other places.
|
|
if (ShouldShowGenericColoredAvatar(GetAvatarIconIndex())) {
|
|
diff --git a/chrome/browser/profiles/profile_avatar_downloader.cc b/chrome/browser/profiles/profile_avatar_downloader.cc
|
|
--- a/chrome/browser/profiles/profile_avatar_downloader.cc
|
|
+++ b/chrome/browser/profiles/profile_avatar_downloader.cc
|
|
@@ -17,17 +17,11 @@
|
|
#include "net/url_request/referrer_policy.h"
|
|
#include "ui/gfx/image/image.h"
|
|
|
|
-namespace {
|
|
-const char kHighResAvatarDownloadUrlPrefix[] =
|
|
- "https://www.gstatic.com/chrome/profile_avatars/";
|
|
-}
|
|
-
|
|
ProfileAvatarDownloader::ProfileAvatarDownloader(size_t icon_index,
|
|
FetchCompleteCallback callback)
|
|
: icon_index_(icon_index), callback_(std::move(callback)) {
|
|
DCHECK(!callback_.is_null());
|
|
- GURL url(std::string(kHighResAvatarDownloadUrlPrefix) +
|
|
- profiles::GetDefaultAvatarIconFileNameAtIndex(icon_index));
|
|
+ GURL url(std::string("about:blank"));
|
|
net::NetworkTrafficAnnotationTag traffic_annotation =
|
|
net::DefineNetworkTrafficAnnotation("profile_avatar", R"(
|
|
semantics {
|
|
--
|
|
2.17.1
|
|
|