Eliminate sending NOTIFICATION_TOP_SITES_* from TopSites

chrome/browser/history/chrome_history_client.h

Index: chrome/browser/history/chrome_history_client.h
diff --git a/chrome/browser/history/chrome_history_client.h b/chrome/browser/history/chrome_history_client.h
index 1a02506fb8ab437cbd147c4c26d5acc818eb197f..12442a09c206b1ffb534a6c2fc7bae6442e3113d 100644
--- a/chrome/browser/history/chrome_history_client.h
+++ b/chrome/browser/history/chrome_history_client.h
@@ -7,14 +7,24 @@
 
 #include "base/macros.h"
 #include "components/history/core/browser/history_client.h"
+#include "components/history/core/browser/top_sites_observer.h"
 
 class BookmarkModel;
+class Profile;
+
+namespace history {
+class TopSites;
+}
 
 // This class implements history::HistoryClient to abstract operations that
 // depend on Chrome environment.
-class ChromeHistoryClient : public history::HistoryClient {
+class ChromeHistoryClient : public history::HistoryClient,
+                            public history::TopSitesObserver {
  public:
-  explicit ChromeHistoryClient(BookmarkModel* bookmark_model);
+  explicit ChromeHistoryClient(BookmarkModel* bookmark_model,
+                               Profile* profile,
+                               history::TopSites* top_sites);
+  virtual ~ChromeHistoryClient();
 
   // history::HistoryClient:
   virtual void BlockUntilBookmarksLoaded() OVERRIDE;
@@ -27,9 +37,15 @@ class ChromeHistoryClient : public history::HistoryClient {
   // KeyedService:
   virtual void Shutdown() OVERRIDE;
 
+  // TopSitesObserver:
+  virtual void TopSitesLoaded(history::TopSites* top_sites) OVERRIDE;
+  virtual void TopSitesChanged(history::TopSites* top_sites) OVERRIDE;
+
  private:
   // The BookmarkModel, this should outlive ChromeHistoryClient.
   BookmarkModel* bookmark_model_;
+  Profile* profile_;
+  history::TopSites* top_sites_;

[brettw, 2014/08/19 22:51:58]

Can you put a comment here like you did in the code review clarifying that this
is a non-owning pointer and talk why the lifetime of this is OK?

[nshaik, 2014/08/20 18:31:35]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(ChromeHistoryClient);
 };