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

Unified Diff: components/ntp_tiles/most_visited_sites.cc

Issue 2668943002: provide static popular sites for first run (Closed)
Patch Set: Add dependencies. Protect access with field_trial Created 3 years, 10 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 | « components/ntp_tiles/DEPS ('k') | components/ntp_tiles/popular_sites_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/ntp_tiles/most_visited_sites.cc
diff --git a/components/ntp_tiles/most_visited_sites.cc b/components/ntp_tiles/most_visited_sites.cc
index 6df20e31c89d74107da78ad0a2a868b7dd370476..6785ba0f4cd2809a83ea6bd362da65f55f318277 100644
--- a/components/ntp_tiles/most_visited_sites.cc
+++ b/components/ntp_tiles/most_visited_sites.cc
@@ -326,7 +326,8 @@ NTPTilesVector MostVisitedSites::CreatePopularSitesTiles(
const NTPTilesVector& personal_tiles,
const NTPTilesVector& whitelist_tiles) {
// For child accounts popular sites tiles will not be added.
- if (supervisor_ && supervisor_->IsChildProfile())
+ if ((supervisor_ && supervisor_->IsChildProfile()) ||
+ !ShouldShowPopularSites())
sfiera 2017/02/13 15:05:54 I think this should be in the lower if-statement,
fhorschig 2017/02/13 18:13:44 Okay.
return NTPTilesVector();
size_t num_tiles = personal_tiles.size() + whitelist_tiles.size();
@@ -417,9 +418,6 @@ void MostVisitedSites::OnPopularSitesDownloaded(bool success) {
LOG(WARNING) << "Download of popular sites failed";
return;
}
-
- // Re-build the tile list. Once done, this will notify the observer.
- BuildCurrentTiles();
}
void MostVisitedSites::OnIconMadeAvailable(const GURL& site_url,
« no previous file with comments | « components/ntp_tiles/DEPS ('k') | components/ntp_tiles/popular_sites_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698