Add support for components/ntp_tiles in InstantService

chrome/browser/search/instant_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_
 #define CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_
 
 #include <memory>
 #include <set>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/history/core/browser/top_sites_observer.h"
 #include "components/keyed_service/core/keyed_service.h"
+#include "components/ntp_tiles/most_visited_sites.h"
+#include "components/ntp_tiles/ntp_tile.h"
 #include "components/search_engines/template_url_service_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "url/gurl.h"
 
 class InstantIOContext;
 struct InstantMostVisitedItem;
 class InstantSearchPrerenderer;
 class InstantServiceObserver;
 class Profile;
 struct TemplateURLData;
 class TemplateURLService;
 struct ThemeBackgroundInfo;
 
 namespace content {
 class RenderProcessHost;
 }
 
+namespace history {
+class TopSites;
+}
+
 // Tracks render process host IDs that are associated with Instant.
 class InstantService : public KeyedService,
                        public content::NotificationObserver,
                        public TemplateURLServiceObserver,
-                       public history::TopSitesObserver {
+                       public history::TopSitesObserver,
+                       public ntp_tiles::MostVisitedSites::Observer {
  public:
   explicit InstantService(Profile* profile);
   ~InstantService() override;
 
   // Add, remove, and query RenderProcessHost IDs that are associated with
   // Instant processes.
   void AddInstantProcess(int process_id);
   bool IsInstantProcess(int process_id) const;
 
   // Adds/Removes InstantService observers.
@@ skipping 68 matching lines @@
   void TopSitesLoaded(history::TopSites* top_sites) override;
   void TopSitesChanged(history::TopSites* top_sites,
                        ChangeReason change_reason) override;
 
   // Called when a renderer process is terminated.
   void OnRendererProcessTerminated(int process_id);
 
   // Called when we get new most visited items from TopSites, registered as an
   // async callback. Parses them and sends them to the renderer via
   // NotifyAboutMostVisitedItems.
-  void OnMostVisitedItemsReceived(const history::MostVisitedURLList& data);
+  void OnTopSitesReceived(const history::MostVisitedURLList& data);
+
+  // ntp_tiles::MostVisitedSites::Observer implementation.
+  void OnMostVisitedURLsAvailable(
+      const ntp_tiles::NTPTilesVector& tiles) override;
+  void OnIconMadeAvailable(const GURL& site_url) override;
 
   // Notifies the observer about the last known most visited items.
   void NotifyAboutMostVisitedItems();
 
 #if defined(ENABLE_THEMES)
   // Theme changed notification handler.
   void OnThemeChanged();
 #endif
 
   void ResetInstantSearchPrerendererIfNecessary();
@@ skipping 20 matching lines @@
   scoped_refptr<InstantIOContext> instant_io_context_;
 
   // Set to NULL if the default search provider does not support Instant.
   std::unique_ptr<InstantSearchPrerenderer> instant_prerenderer_;
 
   // Used to check whether notifications from TemplateURLService indicate a
   // change that affects the default search provider.
   std::unique_ptr<TemplateURLData> previous_default_search_provider_;
   GURL previous_google_base_url_;
 
+  // Data sources for NTP tiles (aka Most Visited tiles). Only one of these will
+  // be non-null.
+  std::unique_ptr<ntp_tiles::MostVisitedSites> most_visited_sites_;
+  scoped_refptr<history::TopSites> top_sites_;
+
   // Used for Top Sites async retrieval.
   base::WeakPtrFactory<InstantService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantService);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_