Merge 21608 - , INNTP: Adds 2 hard coded thumbnails....

chrome/browser/dom_ui/new_tab_ui.cc

 // Copyright (c) 2006-2008 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 "build/build_config.h"
 
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 
+#include <set>
+
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/histogram.h"
 #include "base/string_piece.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser.h"
@@ skipping 26 matching lines @@
 #include "chrome/personalization/personalization.h"
 #endif
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
 namespace {
 
 // The number of most visited pages we show.
-const size_t kMostVisitedPages = 9;
+const size_t kMostVisitedPages = 8;
+
+// The number of most visited pages we show on the old new tab page.
+const size_t kOldMostVisitedPages = 9;
 
 // The number of days of history we consider for most visited entries.
 const int kMostVisitedScope = 90;
 
 // The number of recent bookmarks we show.
 const int kRecentBookmarks = 9;
 
 // The number of search URLs to show.
 const int kSearchURLs = 3;
 
@@ skipping 401 matching lines @@
       incognito_tab_html, &localized_strings);
 
   scoped_refptr<RefCountedBytes> html_bytes(new RefCountedBytes);
   html_bytes->data.resize(full_html.size());
   std::copy(full_html.begin(), full_html.end(), html_bytes->data.begin());
 
   SendResponse(request_id, html_bytes);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
+// MostVisitedPage
+
+// This struct is used when getting the prepopulated pages in case the user
+// hasn't filled up his most visited pages.
+struct MostVisitedPage {
+  std::wstring title;
+  GURL url;
+  GURL thumbnail_url;
+  GURL favicon_url;
+};
+
+///////////////////////////////////////////////////////////////////////////////
 // MostVisitedHandler
 
 // The handler for Javascript messages related to the "most visited" view.
 class MostVisitedHandler : public DOMMessageHandler,
                            public NotificationObserver {
  public:
   MostVisitedHandler() : url_blacklist_(NULL), pinned_urls_(NULL) {}
   virtual ~MostVisitedHandler() { }
 
   // DOMMessageHandler override and implementation.
@@ skipping 42 matching lines @@
   std::wstring GetDictionaryKeyForURL(const std::string& url);
 
   // Gets the |url| and |title| for a pinned URL at a given index. This returns
   // true if found.
   const bool GetPinnedURLAtIndex(const int index, std::string* url,
                                  std::string* title);
 
   void AddPinnedURL(const GURL& url, const std::string& title, int index);
   void RemovePinnedURL(const GURL& url);
 
+  static std::vector<MostVisitedPage> GetPrePopulatedPages();
+
   NotificationRegistrar registrar_;
 
   // Our consumer for the history service.
   CancelableRequestConsumerTSimple<PageUsageData*> cancelable_consumer_;
 
   // The most visited URLs, in priority order.
   // Only used for matching up clicks on the page to which most visited entry
   // was clicked on for metrics purposes.
   std::vector<GURL> most_visited_urls_;
 
@@ skipping 217 matching lines @@
   }
 
   return false;
 }
 
 void MostVisitedHandler::OnSegmentUsageAvailable(
     CancelableRequestProvider::Handle handle,
     std::vector<PageUsageData*>* data) {
   most_visited_urls_.clear();
   ListValue pages_value;
+  std::set<GURL> seen_urls;
 
   size_t data_index = 0;
   size_t output_index = 0;
-  while (output_index < kMostVisitedPages && data_index < data->size()) {
+  const size_t pages_count = NewTabUI::UseOldNewTabPage() ?
+      kOldMostVisitedPages : kMostVisitedPages;
+  while (output_index < pages_count && data_index < data->size()) {
     bool pinned = false;
     GURL url;
     string16 title;
     std::string pinned_url;
     std::string pinned_title;
 
     if (MostVisitedHandler::GetPinnedURLAtIndex(output_index, &pinned_url,
                                                 &pinned_title)) {
       url = GURL(pinned_url);
       title = UTF8ToUTF16(pinned_title);
@@ skipping 11 matching lines @@
       title = page.GetTitle();
     }
 
     // Found a page.
     DictionaryValue* page_value = new DictionaryValue();
     SetURLTitleAndDirection(page_value, title, url);
     page_value->SetBoolean(L"pinned", pinned);
     pages_value.Append(page_value);
     output_index++;
     most_visited_urls_.push_back(url);
+    seen_urls.insert(url);
   }
 
   // If we found no pages we treat this as the first run.
   FundamentalValue first_run(NewTabHTMLSource::first_run() &&
                              pages_value.GetSize() == 0);
   // but first_run should only be true once.
   NewTabHTMLSource::set_first_run(false);
 
+  // If we have less than pages_count we add some predetermined pages.
+  if (pages_value.GetSize() < pages_count) {
+    static std::vector<MostVisitedPage> pages =
+        MostVisitedHandler::GetPrePopulatedPages();
+    for (std::vector<MostVisitedPage>::const_iterator it = pages.begin();
+        it != pages.end() && pages_value.GetSize() < pages_count;
+        ++it) {
+      MostVisitedPage page = *it;
+      std::wstring key = GetDictionaryKeyForURL(page.url.spec());
+      if (!pinned_urls_->HasKey(key) && !url_blacklist_->HasKey(key) &&
+          seen_urls.find(page.url) == seen_urls.end()) {
+        DictionaryValue* page_value = new DictionaryValue();
+        SetURLTitleAndDirection(page_value, WideToUTF16(page.title), page.url);
+        page_value->SetBoolean(L"pinned", false);
+        page_value->SetString(L"thumbnailUrl", page.thumbnail_url.spec());
+        page_value->SetString(L"faviconUrl", page.favicon_url.spec());
+        pages_value.Append(page_value);
+        most_visited_urls_.push_back(page.url);
+        seen_urls.insert(page.url);
+      }
+    }
+  }
+
   dom_ui_->CallJavascriptFunction(L"mostVisitedPages", pages_value, first_run);
 }
 
+// static
+std::vector<MostVisitedPage> MostVisitedHandler::GetPrePopulatedPages() {
+  // TODO(arv): This needs to get the data from some configurable place.
+  // http://crbug.com/17630
+  std::vector<MostVisitedPage> pages;
+
+  MostVisitedPage welcome_page = {
+      l10n_util::GetString(IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE),
+      GURL(WideToUTF8(l10n_util::GetString(IDS_CHROME_WELCOME_URL))),
+      GURL("chrome://theme/newtab_chrome_welcome_page_thumbnail"),
+      GURL("chrome://theme/newtab_chrome_welcome_page_favicon")};
+  pages.push_back(welcome_page);
+
+  MostVisitedPage gallery_page = {
+      l10n_util::GetString(IDS_NEW_TAB_THEMES_GALLERY_PAGE_TITLE),
+      GURL(WideToUTF8(l10n_util::GetString(IDS_THEMES_GALLERY_URL))),
+      GURL("chrome://theme/newtab_themes_gallery_thumbnail"),
+      GURL("chrome://theme/newtab_themes_gallery_favicon")};
+  pages.push_back(gallery_page);
+
+  return pages;
+}
+
 void MostVisitedHandler::Observe(NotificationType type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   if (type != NotificationType::HISTORY_URLS_DELETED) {
     NOTREACHED();
     return;
   }
 
   // Some URLs were deleted from history.  Reload the most visited list.
   HandleGetMostVisited(NULL);
@@ skipping 691 matching lines @@
 bool NewTabUI::UseOldNewTabPage() {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   return command_line->HasSwitch(switches::kOldNewTabPage);
 }
 
 // static
 bool NewTabUI::WebResourcesDisabled() {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   return command_line->HasSwitch(switches::kDisableWebResources);
 }