Use whitelist large icon for corresponding most visited suggestions.

chrome/browser/android/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 "chrome/browser/android/most_visited_sites.h"
 
 #include <utility>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 440 matching lines @@
   scoped_refptr<TopSites> top_sites = TopSitesFactory::GetForProfile(profile_);
   if (!top_sites)
     return;
 
   top_sites->GetMostVisitedURLs(
       base::Bind(&MostVisitedSites::OnMostVisitedURLsAvailable,
                  weak_ptr_factory_.GetWeakPtr()),
       false);
 }
 
+base::FilePath MostVisitedSites::GetWhitelistLargeIconPath(const GURL& url) {
+  SupervisedUserService* supervised_user_service =
+      SupervisedUserServiceFactory::GetForProfile(profile_);
+
+  for (const auto& whitelist : supervised_user_service->whitelists()) {
+    if (whitelist->entry_point().GetContent() == url.GetContent())

[Bernhard Bauer, 2016/03/17 15:49:00]

Hm... content is everything after the scheme, so including query parameters and
fragment identifier, but _not_ the scheme... Is that what we want?

(I mean, the question of when two URLs are the "same" is surprisingly
complicated, so we might have to compromise in some form anyway, but I'd like to
at least do that consciously.)

[atanasova, 2016/03/17 16:02:08]

Marc and I discussed in the previous comments that using host() will not be
appropriate, since we want to use the whitelist icon when it is the same url. I
personally think that using everything after the scheme will be enough to
distinguish the URLs. Since this is a feature that is going to be used by
children who might not be able to fully type out addresses, I think that
different schemes in URLs will still lead to the same source.
However, I am open to suggestions to how we can improve this and we can
definitely discuss how exact do we want to be vs. trying to "anticipate" what
the child meant.

[Marc Treib, 2016/03/17 16:29:02]

I think Bernhard's suggesting to use less than the full GetContent() - we're
probably not interested in query params.

[Bernhard Bauer, 2016/03/17 17:44:30]

Exactly. And in particular, I'd like to explicitly list the things we are
looking at for equality purposes here, so for example host and path?

[atanasova, 2016/03/22 12:21:49]

Changed to use host+path as discussed here and in the email thread.

+      return whitelist->large_icon_path();
+  }
+  return base::FilePath();
+}
+
 void MostVisitedSites::OnMostVisitedURLsAvailable(
     const history::MostVisitedURLList& visited_list) {
   SupervisedUserURLFilter* url_filter =
       SupervisedUserServiceFactory::GetForProfile(profile_)
           ->GetURLFilterForUIThread();
+
   MostVisitedSites::SuggestionsVector suggestions;
   size_t num_tiles =
       std::min(visited_list.size(), static_cast<size_t>(num_sites_));
   for (size_t i = 0; i < num_tiles; ++i) {
     const history::MostVisitedURL& visited = visited_list[i];
     if (visited.url.is_empty()) {
       num_tiles = i;
       break;  // This is the signal that there are no more real visited sites.
     }
     if (url_filter->GetFilteringBehaviorForURL(visited.url) ==
         SupervisedUserURLFilter::FilteringBehavior::BLOCK) {
       continue;
     }
 
     scoped_ptr<Suggestion> suggestion(make_scoped_ptr(new Suggestion()));
     suggestion->title = visited.title;
     suggestion->url = visited.url;
     suggestion->source = TOP_SITES;
+    suggestion->whitelist_icon_path = GetWhitelistLargeIconPath(visited.url);
 
     suggestions.push_back(std::move(suggestion));
   }
 
   received_most_visited_sites_ = true;
   mv_source_ = TOP_SITES;
   SaveNewNTPSuggestions(&suggestions);
   NotifyMostVisitedURLsObserver();
 }
 
@@ skipping 17 matching lines @@
     if (url_filter->GetFilteringBehaviorForURL(GURL(suggestion.url())) ==
         SupervisedUserURLFilter::FilteringBehavior::BLOCK) {
       continue;
     }
 
     scoped_ptr<Suggestion> generated_suggestion(
         make_scoped_ptr(new Suggestion()));
     generated_suggestion->title = base::UTF8ToUTF16(suggestion.title());
     generated_suggestion->url = GURL(suggestion.url());
     generated_suggestion->source = SUGGESTIONS_SERVICE;
+    generated_suggestion->whitelist_icon_path = GetWhitelistLargeIconPath(
+        GURL(suggestion.url()));
     if (suggestion.providers_size() > 0)
       generated_suggestion->provider_index = suggestion.providers(0);
 
     suggestions.push_back(std::move(generated_suggestion));
   }
 
   received_most_visited_sites_ = true;
   mv_source_ = SUGGESTIONS_SERVICE;
   SaveNewNTPSuggestions(&suggestions);
   NotifyMostVisitedURLsObserver();
@@ skipping 336 matching lines @@
   }
 }
 
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jobject>& obj,
                   const JavaParamRef<jobject>& jprofile) {
   MostVisitedSites* most_visited_sites =
       new MostVisitedSites(ProfileAndroid::FromProfileAndroid(jprofile));
   return reinterpret_cast<intptr_t>(most_visited_sites);
 }