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

Unified Diff: chrome/browser/profiles/profile_avatar_downloader.cc

Issue 1020863007: Revert of Change default code flag to NewAvatarMenu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profiles/profile_avatar_downloader.h ('k') | chrome/browser/profiles/profile_info_cache.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_avatar_downloader.cc
diff --git a/chrome/browser/profiles/profile_avatar_downloader.cc b/chrome/browser/profiles/profile_avatar_downloader.cc
index c3a98558f86c0405ceb89971b903724761aec222..f00dc76122dbc4e04d42a010664575c34a58d431 100644
--- a/chrome/browser/profiles/profile_avatar_downloader.cc
+++ b/chrome/browser/profiles/profile_avatar_downloader.cc
@@ -22,12 +22,6 @@
ProfileInfoCache* cache)
: icon_index_(icon_index),
profile_path_(profile_path),
- // The downloader should only execute on desktop platforms.
-#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
- downloader_active_(true),
-#else
- downloader_active_(false),
-#endif
cache_(cache) {
GURL url(std::string(kHighResAvatarDownloadUrlPrefix) +
profiles::GetDefaultAvatarIconFileNameAtIndex(icon_index));
@@ -38,9 +32,6 @@
}
void ProfileAvatarDownloader::Start() {
- if (!downloader_active_)
- return;
-
// In unit tests, the browser process can return a NULL request context.
net::URLRequestContextGetter* request_context =
g_browser_process->system_request_context();
@@ -55,7 +46,7 @@
// BitmapFetcherDelegate overrides.
void ProfileAvatarDownloader::OnFetchComplete(const GURL url,
const SkBitmap* bitmap) {
- if (!bitmap || !cache_ || !downloader_active_)
+ if (!bitmap || !cache_)
return;
// Decode the downloaded bitmap. Ownership of the image is taken by |cache_|.
« no previous file with comments | « chrome/browser/profiles/profile_avatar_downloader.h ('k') | chrome/browser/profiles/profile_info_cache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698