Eliminate sending NOTIFICATION_TOP_SITES_* from TopSites

chrome/browser/history/top_sites.h

 // Copyright (c) 2012 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_HISTORY_TOP_SITES_H_
 #define CHROME_BROWSER_HISTORY_TOP_SITES_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_types.h"
+#include "chrome/browser/history/top_sites_observer.h"
 #include "components/history/core/common/thumbnail_score.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/image/image.h"
 
 class GURL;
 class Profile;
 
 namespace base {
 class FilePath;
 class RefCountedBytes;
 class RefCountedMemory;
 }
 
 namespace history {
 
 class TopSitesCache;
 
 // Interface for TopSites, which stores the data for the top "most visited"
 // sites. This includes a cache of the most visited data from history, as well
 // as the corresponding thumbnails of those sites.
 //
 // Some methods should only be called from the UI thread (see method
 // descriptions below). All others are assumed to be threadsafe.
 class TopSites
     : public base::RefCountedThreadSafe<TopSites>,
       public content::NotificationObserver {
  public:
-  TopSites() {}
+  TopSites();
 
   // Initializes TopSites.
   static TopSites* Create(Profile* profile, const base::FilePath& db_name);
 
   // Sets the given thumbnail for the given URL. Returns true if the thumbnail
   // was updated. False means either the URL wasn't known to us, or we felt
   // that our current thumbnail was superior to the given one. Should be called
   // from the UI thread.
   virtual bool SetPageThumbnail(const GURL& url,
                                 const gfx::Image& thumbnail,
@@ skipping 108 matching lines @@
     int url_id;
     // The string resource for the page title.
     int title_id;
     // The raw data resource for the favicon.
     int favicon_id;
     // The raw data resource for the thumbnail.
     int thumbnail_id;
     // The best color to highlight the page (should roughly match favicon).
     SkColor color;
   };
+
+  // TopSitesObserver

[sdefresne, 2014/08/04 08:47:18]

Remove this comment block and the Observer type defined here (it is not used,
instead you are using TopSitesObserver that is defined in top_sites_observer.h).

[nshaik, 2014/08/05 06:38:03]

My bad.had the old code left there... deleted
On 2014/08/04 08:47:18, sdefresne wrote:

+  // chrome::NOTIFICATION_TOP_SITES_LOADED
+  // chrome::NOTIFICATION_TOP_SITES_CHANGED
+  class Observer {
+   public:
+    virtual void OnTopSitesLoaded(TopSites* top_sites) = 0;
+    virtual void OnTopSitesChanged(TopSites* top_sites) = 0;
+  };
+
+  // Add Observer to the list.
+  void AddObserver(TopSitesObserver* observer) {

[sdefresne, 2014/08/04 08:47:18]

style: do not inline functions, see
http://www.chromium.org/developers/coding-style/cpp-dos-and-donts#TOC-Stop-in...

[nshaik, 2014/08/05 06:38:03]

Done.

+    observer_list_.AddObserver(observer);
+  }
+
+  // Remove Observer from the list.
+  void RemoveObserver(TopSitesObserver* observer) {
+    observer_list_.RemoveObserver(observer);
+  }
+
+  void NotifyTopSitesLoaded() {

[sdefresne, 2014/08/04 08:47:18]

Move to the protected: section since this is only called by TopSitesImpl.

[nshaik, 2014/08/05 06:38:03]

Done.

+    FOR_EACH_OBSERVER(TopSitesObserver, observer_list_, TopSitesLoaded(this));
+  }
+
+  void NotifyTopSitesChanged() {

[sdefresne, 2014/08/04 08:47:18]

Move to the protected: section since this is only called by TopSitesImpl.

[nshaik, 2014/08/05 06:38:03]

Done.

+    FOR_EACH_OBSERVER(TopSitesObserver, observer_list_, TopSitesChanged(this));
+  }
+
+  // Get the current Profile.

[sdefresne, 2014/08/04 08:47:18]

Remove, instead pass the Profile to ChromeHistoryClient constructor.

[nshaik, 2014/08/05 06:38:03]

Done.

+  virtual Profile* GetProfile();
+
  protected:
-  virtual ~TopSites() {}
+  virtual ~TopSites();
 
  private:
+  ObserverList<TopSitesObserver> observer_list_;
   friend class base::RefCountedThreadSafe<TopSites>;
 };
 
 #if defined(OS_ANDROID)
 extern const TopSites::PrepopulatedPage kPrepopulatedPages[1];
 #else
 extern const TopSites::PrepopulatedPage kPrepopulatedPages[2];
 #endif
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_TOP_SITES_H_