Remove TopSites notification in favor of Observers

chrome/browser/ui/views/frame/global_menu_bar_x11.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_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_
 
 #include <map>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
+#include "base/scoped_observer.h"
 #include "chrome/browser/command_observer.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/avatar_menu_observer.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "components/history/core/browser/history_types.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
+#include "components/history/core/browser/top_sites_observer.h"
 #include "ui/base/glib/glib_signal.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h"
 
 typedef struct _DbusmenuMenuitem DbusmenuMenuitem;
 typedef struct _DbusmenuServer   DbusmenuServer;
 
 namespace history {
 class TopSites;
 }
 
@@ skipping 12 matching lines @@
 //
 // Unity has an Apple-like menu bar at the top of the screen that changes
 // depending on the active window. In the GTK port, we had a hidden GtkMenuBar
 // object in each GtkWindow which existed only to be scrapped by the
 // libdbusmenu-gtk code. Since we don't have GtkWindows anymore, we need to
 // interface directly with the lower level libdbusmenu-glib, which we
 // opportunistically dlopen() since not everyone is running Ubuntu.
 class GlobalMenuBarX11 : public AvatarMenuObserver,
                          public chrome::BrowserListObserver,
                          public CommandObserver,
-                         public content::NotificationObserver,
+                         public history::TopSitesObserver,
                          public TabRestoreServiceObserver,
                          public views::DesktopWindowTreeHostObserverX11 {
  public:
   GlobalMenuBarX11(BrowserView* browser_view,
                    BrowserDesktopWindowTreeHostX11* host);
   ~GlobalMenuBarX11() override;
 
   // Creates the object path for DbusemenuServer which is attached to |xid|.
   static std::string GetPathForWindow(unsigned long xid);
 
@@ skipping 57 matching lines @@
 
   // Overridden from AvatarMenuObserver:
   void OnAvatarMenuChanged(AvatarMenu* avatar_menu) override;
 
   // Overridden from chrome::BrowserListObserver:
   void OnBrowserSetLastActive(Browser* browser) override;
 
   // Overridden from CommandObserver:
   void EnabledStateChangedForCommand(int id, bool enabled) override;
 
-  // Overridden from content::NotificationObserver:
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
+  // Overridden from history::TopSitesObserver:
+  void TopSitesLoaded(history::TopSites* top_sites) override;
+  void TopSitesChanged(history::TopSites* top_sites) override;
 
   // Overridden from TabRestoreServiceObserver:
   void TabRestoreServiceChanged(TabRestoreService* service) override;
   void TabRestoreServiceDestroyed(TabRestoreService* service) override;
 
   // Overridden from views::DesktopWindowTreeHostObserverX11:
   void OnWindowMapped(unsigned long xid) override;
   void OnWindowUnmapped(unsigned long xid) override;
 
   CHROMEG_CALLBACK_1(GlobalMenuBarX11, void, OnItemActivated, DbusmenuMenuitem*,
@@ skipping 25 matching lines @@
 
   // Tracks value of the kShowBookmarkBar preference.
   PrefChangeRegistrar pref_change_registrar_;
 
   history::TopSites* top_sites_;
 
   TabRestoreService* tab_restore_service_;  // weak
 
   scoped_ptr<AvatarMenu> avatar_menu_;
 
-  content::NotificationRegistrar registrar_;
+  ScopedObserver<history::TopSites, history::TopSitesObserver> scoped_observer_;
 
   // For callbacks may be run after destruction.
   base::WeakPtrFactory<GlobalMenuBarX11> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GlobalMenuBarX11);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_GLOBAL_MENU_BAR_X11_H_