| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/ntp_tiles/most_visited_sites.h" | 5 #include "components/ntp_tiles/most_visited_sites.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 if (supervisor_ && supervisor_->IsBlocked(url)) | 262 if (supervisor_ && supervisor_->IsBlocked(url)) |
| 263 continue; | 263 continue; |
| 264 | 264 |
| 265 NTPTile tile; | 265 NTPTile tile; |
| 266 tile.title = base::UTF8ToUTF16(suggestion_pb.title()); | 266 tile.title = base::UTF8ToUTF16(suggestion_pb.title()); |
| 267 tile.url = url; | 267 tile.url = url; |
| 268 tile.source = NTPTileSource::SUGGESTIONS_SERVICE; | 268 tile.source = NTPTileSource::SUGGESTIONS_SERVICE; |
| 269 tile.whitelist_icon_path = GetWhitelistLargeIconPath(url); | 269 tile.whitelist_icon_path = GetWhitelistLargeIconPath(url); |
| 270 tile.thumbnail_url = GURL(suggestion_pb.thumbnail()); | 270 tile.thumbnail_url = GURL(suggestion_pb.thumbnail()); |
| 271 tile.favicon_url = GURL(suggestion_pb.favicon_url()); | 271 tile.favicon_url = GURL(suggestion_pb.favicon_url()); |
| 272 icon_cacher_->StartFetchMostLikely( |
| 273 url, base::Bind(&MostVisitedSites::OnIconMadeAvailable, |
| 274 base::Unretained(this), url)); |
| 272 | 275 |
| 273 tiles.push_back(std::move(tile)); | 276 tiles.push_back(std::move(tile)); |
| 274 } | 277 } |
| 275 | 278 |
| 276 mv_source_ = NTPTileSource::SUGGESTIONS_SERVICE; | 279 mv_source_ = NTPTileSource::SUGGESTIONS_SERVICE; |
| 277 SaveNewTiles(std::move(tiles)); | 280 SaveNewTiles(std::move(tiles)); |
| 278 NotifyMostVisitedURLsObserver(); | 281 NotifyMostVisitedURLsObserver(); |
| 279 } | 282 } |
| 280 | 283 |
| 281 NTPTilesVector MostVisitedSites::CreateWhitelistEntryPointTiles( | 284 NTPTilesVector MostVisitedSites::CreateWhitelistEntryPointTiles( |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 // Skip tiles already present in personal or whitelists. | 355 // Skip tiles already present in personal or whitelists. |
| 353 if (hosts.find(host) != hosts.end()) | 356 if (hosts.find(host) != hosts.end()) |
| 354 continue; | 357 continue; |
| 355 | 358 |
| 356 NTPTile tile; | 359 NTPTile tile; |
| 357 tile.title = popular_site.title; | 360 tile.title = popular_site.title; |
| 358 tile.url = GURL(popular_site.url); | 361 tile.url = GURL(popular_site.url); |
| 359 tile.source = NTPTileSource::POPULAR; | 362 tile.source = NTPTileSource::POPULAR; |
| 360 | 363 |
| 361 popular_sites_tiles.push_back(std::move(tile)); | 364 popular_sites_tiles.push_back(std::move(tile)); |
| 362 icon_cacher_->StartFetch( | 365 icon_cacher_->StartFetchPopularSites( |
| 363 popular_site, base::Bind(&MostVisitedSites::OnIconMadeAvailable, | 366 popular_site, base::Bind(&MostVisitedSites::OnIconMadeAvailable, |
| 364 base::Unretained(this), popular_site.url)); | 367 base::Unretained(this), popular_site.url)); |
| 365 if (popular_sites_tiles.size() >= num_popular_sites_tiles) | 368 if (popular_sites_tiles.size() >= num_popular_sites_tiles) |
| 366 break; | 369 break; |
| 367 } | 370 } |
| 368 } | 371 } |
| 369 return popular_sites_tiles; | 372 return popular_sites_tiles; |
| 370 } | 373 } |
| 371 | 374 |
| 372 void MostVisitedSites::SaveNewTiles(NTPTilesVector personal_tiles) { | 375 void MostVisitedSites::SaveNewTiles(NTPTilesVector personal_tiles) { |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 430 | 433 |
| 431 void MostVisitedSites::TopSitesChanged(TopSites* top_sites, | 434 void MostVisitedSites::TopSitesChanged(TopSites* top_sites, |
| 432 ChangeReason change_reason) { | 435 ChangeReason change_reason) { |
| 433 if (mv_source_ == NTPTileSource::TOP_SITES) { | 436 if (mv_source_ == NTPTileSource::TOP_SITES) { |
| 434 // The displayed tiles are invalidated. | 437 // The displayed tiles are invalidated. |
| 435 InitiateTopSitesQuery(); | 438 InitiateTopSitesQuery(); |
| 436 } | 439 } |
| 437 } | 440 } |
| 438 | 441 |
| 439 } // namespace ntp_tiles | 442 } // namespace ntp_tiles |
| OLD | NEW |