Adding CrHome-specific implementation for home page tile.

components/ntp_tiles/most_visited_sites.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/ntp_tiles/most_visited_sites.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 34 matching lines @@
 }
 
 }  // namespace
 
 MostVisitedSites::MostVisitedSites(
     PrefService* prefs,
     scoped_refptr<history::TopSites> top_sites,
     SuggestionsService* suggestions,
     std::unique_ptr<PopularSites> popular_sites,
     std::unique_ptr<IconCacher> icon_cacher,
-    std::unique_ptr<MostVisitedSitesSupervisor> supervisor,
-    std::unique_ptr<HomePageClient> home_page_client)
+    std::unique_ptr<MostVisitedSitesSupervisor> supervisor)
     : prefs_(prefs),
       top_sites_(top_sites),
       suggestions_service_(suggestions),
       popular_sites_(std::move(popular_sites)),
       icon_cacher_(std::move(icon_cacher)),
       supervisor_(std::move(supervisor)),
-      home_page_client_(std::move(home_page_client)),
+      home_page_client_(nullptr),

[mastiz, 2017/06/01 08:18:44]

Nit: no need for this line, unique_ptr constructs empty by default, as opposed
to raw points like observer_ below.

[fhorschig, 2017/06/01 10:12:56]

Gone.

       observer_(nullptr),
       num_sites_(0u),
       top_sites_observer_(this),
       mv_source_(TileSource::TOP_SITES),
       top_sites_weak_ptr_factory_(this) {
   DCHECK(prefs_);
   // top_sites_ can be null in tests.
   // TODO(sfiera): have iOS use a dummy TopSites in its tests.
   DCHECK(suggestions_service_);
   if (supervisor_)
     supervisor_->SetObserver(this);
 }
 
-MostVisitedSites::MostVisitedSites(
-    PrefService* prefs,
-    scoped_refptr<history::TopSites> top_sites,
-    SuggestionsService* suggestions,
-    std::unique_ptr<PopularSites> popular_sites,
-    std::unique_ptr<IconCacher> icon_cacher,
-    std::unique_ptr<MostVisitedSitesSupervisor> supervisor)
-    : MostVisitedSites(prefs,
-                       top_sites,
-                       suggestions,
-                       std::move(popular_sites),
-                       std::move(icon_cacher),
-                       std::move(supervisor),
-                       nullptr) {}
-
 MostVisitedSites::~MostVisitedSites() {
   if (supervisor_)
     supervisor_->SetObserver(nullptr);
 }
 
 bool MostVisitedSites::DoesSourceExist(TileSource source) const {
   switch (source) {
     case TileSource::TOP_SITES:
       return top_sites_ != nullptr;
     case TileSource::SUGGESTIONS_SERVICE:
       return suggestions_service_ != nullptr;
     case TileSource::POPULAR:
       return popular_sites_ != nullptr;
     case TileSource::WHITELIST:
       return supervisor_ != nullptr;
     case TileSource::HOMEPAGE:
       return home_page_client_ != nullptr;
   }
   NOTREACHED();
   return false;
 }
 
+void MostVisitedSites::SetHomePageClient(
+    std::unique_ptr<HomePageClient> client) {
+  DCHECK(client);
+  home_page_client_ = std::move(client);
+}
+
 void MostVisitedSites::SetMostVisitedURLsObserver(Observer* observer,
                                                   size_t num_sites) {
   DCHECK(observer);
   observer_ = observer;
   num_sites_ = num_sites;
 
   // The order for this condition is important, ShouldShowPopularSites() should
   // always be called last to keep metrics as relevant as possible.
   if (popular_sites_ && NeedPopularSites(prefs_, num_sites_) &&
       ShouldShowPopularSites()) {
@@ skipping 363 matching lines @@
     // The displayed tiles are invalidated.
     InitiateTopSitesQuery();
   }
 }
 
 bool MostVisitedSites::ShouldAddHomeTile() const {
   return base::FeatureList::IsEnabled(kPinHomePageAsTileFeature) &&
          num_sites_ > 0u && home_page_client_ &&
          home_page_client_->IsHomePageEnabled() &&
          !home_page_client_->IsNewTabPageUsedAsHomePage() &&
+         !home_page_client_->GetHomepageUrl().is_empty() &&

[mastiz, 2017/06/01 08:18:44]

For safety, check for home_page_client_ being nonnull?

[fhorschig, 2017/06/01 10:12:56]

Added a comment to make this existing check more visible.
(Otherwise, git cl format will hide it again.)

[mastiz, 2017/06/01 10:59:24]

Oop, sorry, I totally missed the fact that it predates this CL.

          !(top_sites_ &&
            top_sites_->IsBlacklisted(home_page_client_->GetHomepageUrl()));
 }
 
 void MostVisitedSites::AddToHostsAndTotalCount(const NTPTilesVector& new_tiles,
                                                std::set<std::string>* hosts,
                                                size_t* total_tile_count) const {
   for (const auto& tile : new_tiles) {
     hosts->insert(tile.url.host());
   }
   *total_tile_count += new_tiles.size();
   DCHECK_LE(*total_tile_count, num_sites_);
 }
 
 }  // namespace ntp_tiles