Ensure using chrome://thumb2/... adds the URL as a forced URL in TopSites so that a thumbnail is ca…

chrome/browser/ui/webui/ntp/thumbnail_list_source.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/ui/webui/ntp/thumbnail_list_source.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 21 matching lines @@
 
 // If |want_thumbnails| == true, then renders elements in |mvurl_list| that have
 // thumbnails, with their thumbnails. Otherwise renders elements in |mvurl_list|
 // that have no thumbnails.
 void RenderMostVisitedURLList(
     const history::MostVisitedURLList& mvurl_list,
     const std::vector<std::string>& base64_encoded_pngs,
     bool want_thumbnails,
     std::vector<std::string>* out) {
   DCHECK_EQ(mvurl_list.size(), base64_encoded_pngs.size());
-  out->push_back("<div><ul>\n");
+  bool doing_forced_urls = true;
+  out->push_back("<div><b>Forced URLs:</b></div>\n"
+                 "<div><ul>\n");
   for (size_t i = 0; i < mvurl_list.size(); ++i) {
     const history::MostVisitedURL& mvurl = mvurl_list[i];
+    if (doing_forced_urls && mvurl.last_forced_time.is_null()) {
+      out->push_back("</ul></div>\n"
+                     "<div><b>Non-forced URLs:</b></div>\n"
+                     "<div><ul>\n");
+      doing_forced_urls = false;
+    }
     bool has_thumbnail = !base64_encoded_pngs[i].empty();
     if (has_thumbnail == want_thumbnails) {
       out->push_back("<li>\n");
       out->push_back(net::EscapeForHTML(mvurl.url.spec()) + "\n");
       if (want_thumbnails) {
         out->push_back("<div><img class=\"thumb\" "
                        "src=\"data:image/png;base64," +
                        base64_encoded_pngs[i] + "\"/></div>\n");
       }
       if (!mvurl.redirects.empty()) {
@@ skipping 27 matching lines @@
 }
 
 void ThumbnailListSource::StartDataRequest(
     const std::string& path,
     int render_process_id,
     int render_view_id,
     const content::URLDataSource::GotDataCallback& callback) {
   profile_->GetTopSites()->GetMostVisitedURLs(
       base::Bind(&ThumbnailListSource::OnMostVisitedURLsAvailable,
                  weak_ptr_factory_.GetWeakPtr(),
-                 callback), false);
+                 callback), true);
 }
 
 std::string ThumbnailListSource::GetMimeType(const std::string& path) const {
   return "text/html";
 }
 
 base::MessageLoop* ThumbnailListSource::MessageLoopForRequestPath(
     const std::string& path) const {
   // TopSites can be accessed from the IO thread.
   return thumbnail_service_.get() ?
@@ skipping 36 matching lines @@
   }
   if (num_mv_with_thumb < num_mv) {
     out.push_back("<h2>TopSites URLs without Thumbnails</h2>\n");
     RenderMostVisitedURLList(mvurl_list, base64_encoded_pngs, false, &out);
   }
   out.push_back(html_footer);
 
   std::string out_html = JoinString(out, "");
   callback.Run(base::RefCountedString::TakeString(&out_html));
 }