Remove TopSites notification in favor of Observers

chrome/browser/ui/views/frame/global_menu_bar_x11.cc

 // 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.
 
 #include "chrome/browser/ui/views/frame/global_menu_bar_x11.h"
 
 #include <dlfcn.h>
 #include <glib-object.h>
 
 #include "base/debug/leak_annotations.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h"
 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
-#include "content/public/browser/notification_source.h"
 #include "ui/base/accelerators/menu_label_accelerator_util_linux.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
 #include "ui/gfx/text_elider.h"
 
 // libdbusmenu-glib types
 typedef struct _DbusmenuMenuitem DbusmenuMenuitem;
 typedef DbusmenuMenuitem* (*dbusmenu_menuitem_new_func)();
 typedef bool (*dbusmenu_menuitem_child_add_position_func)(
     DbusmenuMenuitem* parent,
@@ skipping 281 matching lines @@
     : browser_(browser_view->browser()),
       profile_(browser_->profile()),
       browser_view_(browser_view),
       host_(host),
       server_(nullptr),
       root_item_(nullptr),
       history_menu_(nullptr),
       profiles_menu_(nullptr),
       top_sites_(nullptr),
       tab_restore_service_(nullptr),
+      scoped_observer_(this),
       weak_ptr_factory_(this) {
   EnsureMethodsLoaded();
 
   if (server_new)
     host_->AddObserver(this);
 }
 
 GlobalMenuBarX11::~GlobalMenuBarX11() {
   if (server_) {
     Disable();
@@ skipping 76 matching lines @@
   pref_change_registrar_.Add(
       bookmarks::prefs::kShowBookmarkBar,
       base::Bind(&GlobalMenuBarX11::OnBookmarkBarVisibilityChanged,
                  base::Unretained(this)));
   OnBookmarkBarVisibilityChanged();
 
   top_sites_ = profile_->GetTopSites();
   if (top_sites_) {
     GetTopSitesData();
 
-    // Register for notification when TopSites changes so that we can update
-    // ourself.
-    registrar_.Add(this, chrome::NOTIFICATION_TOP_SITES_CHANGED,
-                   content::Source<history::TopSites>(top_sites_));
+    // Register as TopSitesObserver so that we can update ourselves when the
+    // TopSites changes.
+    scoped_observer_.Add(top_sites_);
   }
 
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   DCHECK(profile_manager);
   avatar_menu_.reset(new AvatarMenu(
       &profile_manager->GetProfileInfoCache(), this, nullptr));
   avatar_menu_->RebuildMenu();
   BrowserList::AddObserver(this);
 
   RebuildProfilesMenu();
@@ skipping 274 matching lines @@
   avatar_menu_->ActiveBrowserChanged(browser);
   RebuildProfilesMenu();
 }
 
 void GlobalMenuBarX11::EnabledStateChangedForCommand(int id, bool enabled) {
   CommandIDMenuItemMap::iterator it = id_to_menu_item_.find(id);
   if (it != id_to_menu_item_.end())
     menuitem_property_set_bool(it->second, kPropertyEnabled, enabled);
 }
 
-void GlobalMenuBarX11::Observe(int type,
-                               const content::NotificationSource& source,
-                               const content::NotificationDetails& details) {
-  if (type == chrome::NOTIFICATION_TOP_SITES_CHANGED) {
+void GlobalMenuBarX11::TopSitesLoaded(history::TopSites* top_sites) {
+}
+
+void GlobalMenuBarX11::TopSitesChanged(history::TopSites* top_sites) {
     GetTopSitesData();
-  } else {
-    NOTREACHED();
-  }
 }
 
 void GlobalMenuBarX11::TabRestoreServiceChanged(TabRestoreService* service) {
   const TabRestoreService::Entries& entries = service->entries();
 
   ClearMenuSection(history_menu_, TAG_RECENTLY_CLOSED);
 
   // We'll get the index the "Recently Closed" header. (This can vary depending
   // on the number of "Most Visited" items.
   int index = GetIndexOfMenuItemWithTag(history_menu_,
@@ skipping 143 matching lines @@
 void GlobalMenuBarX11::OnEditProfileItemActivated(DbusmenuMenuitem* sender,
                                                   unsigned int timestamp) {
   int id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(sender), kProfileId));
   avatar_menu_->EditProfile(id);
 }
 
 void GlobalMenuBarX11::OnCreateProfileItemActivated(DbusmenuMenuitem* sender,
                                                     unsigned int timestamp) {
   avatar_menu_->AddNewProfile(ProfileMetrics::ADD_NEW_USER_MENU);
 }