Remove NOTIFICATION_HISTORY_URLS_DELETED

chrome/browser/ui/cocoa/history_menu_bridge.mm

 // 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.
 
 #include "chrome/browser/ui/cocoa/history_menu_bridge.h"
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"  // IDC_HISTORY_MENU
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #import "chrome/browser/ui/cocoa/history_menu_cocoa_controller.h"
 #include "chrome/grit/generated_resources.h"
-#include "content/public/browser/notification_registrar.h"
-#include "content/public/browser/notification_source.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/resources/grit/ui_resources.h"
 
 namespace {
 
 // Maximum number of pixels to use for a menu item title.
@@ skipping 73 matching lines @@
   [item setImage:rb.GetNativeImageNamed(IDR_HISTORY_FAVICON).ToNSImage()];
 
 }
 
 // Note that all requests sent to either the history service or the favicon
 // service will be automatically cancelled by their respective Consumers, so
 // task cancellation is not done manually here in the dtor.
 HistoryMenuBridge::~HistoryMenuBridge() {
   // Unregister ourselves as observers and notifications.
   DCHECK(profile_);
-  if (history_service_) {
-    registrar_.Remove(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED,
-                      content::Source<Profile>(profile_));
-  }
 
   if (tab_restore_service_)
     tab_restore_service_->RemoveObserver(this);
 
   // Since the map owns the HistoryItems, delete anything that still exists.
   std::map<NSMenuItem*, HistoryItem*>::iterator it = menu_item_map_.begin();
   while (it != menu_item_map_.end()) {
     HistoryItem* item  = it->second;
     menu_item_map_.erase(it++);
     delete item;
   }
 }
 
-void HistoryMenuBridge::Observe(int type,
-                                const content::NotificationSource& source,
-                                const content::NotificationDetails& details) {
-  // chrome::NOTIFICATION_HISTORY_URLS_DELETED is the only notification we are
-  // registered for. OnHistoryChanged is the generic function called for any
-  // History modifications.
-  OnHistoryChanged();
-}
-
 void HistoryMenuBridge::TabRestoreServiceChanged(TabRestoreService* service) {
   const TabRestoreService::Entries& entries = service->entries();
 
   // Clear the history menu before rebuilding.
   NSMenu* menu = HistoryMenu();
   ClearMenuSection(menu, kRecentlyClosed);
 
   // Index for the next menu item.
   NSInteger index = [menu indexOfItemWithTag:kRecentlyClosedTitle] + 1;
   NSUInteger added_count = 0;
@@ skipping 91 matching lines @@
   ClearMenuSection(menu, kRecentlyClosed);
 }
 
 void HistoryMenuBridge::BuildMenu() {
   // If the history service is ready, use it. Otherwise, a Notification will
   // force an update when it's loaded.
   if (history_service_)
     CreateMenu();
 }
 
-void HistoryMenuBridge::OnURLVisited(HistoryService* history_service,
-                                     ui::PageTransition transition,
-                                     const history::URLRow& row,
-                                     const history::RedirectList& redirects,
-                                     base::Time visit_time) {
-  OnHistoryChanged();
-}
-
-void HistoryMenuBridge::OnURLsModified(HistoryService* history_service,
-                                       const history::URLRows& changed_urls) {
-  OnHistoryChanged();
-}
-
-void HistoryMenuBridge::OnHistoryServiceLoaded(
-    HistoryService* history_service) {
-  history_service_ = history_service;
-  Init();
-}
-
 HistoryMenuBridge::HistoryItem* HistoryMenuBridge::HistoryItemForMenuItem(
     NSMenuItem* item) {
   std::map<NSMenuItem*, HistoryItem*>::iterator it = menu_item_map_.find(item);
   if (it != menu_item_map_.end()) {
     return it->second;
   }
   return NULL;
 }
 
 HistoryService* HistoryMenuBridge::service() {
@@ skipping 67 matching lines @@
   [item->menu_item setToolTip:tooltip];
 
   [menu insertItem:item->menu_item.get() atIndex:index];
   menu_item_map_.insert(std::make_pair(item->menu_item.get(), item));
 
   return item->menu_item.get();
 }
 
 void HistoryMenuBridge::Init() {
   DCHECK(history_service_);
-  registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED,
-                 content::Source<Profile>(profile_));
 }
 
 void HistoryMenuBridge::CreateMenu() {
   // If we're currently running CreateMenu(), wait until it finishes.
   if (create_in_progress_)
     return;
   create_in_progress_ = true;
   need_recreate_ = false;
 
   DCHECK(history_service_);
@@ skipping 92 matching lines @@
 }
 
 void HistoryMenuBridge::CancelFaviconRequest(HistoryItem* item) {
   DCHECK(item);
   if (item->icon_requested) {
     cancelable_task_tracker_.TryCancel(item->icon_task_id);
     item->icon_requested = false;
     item->icon_task_id = base::CancelableTaskTracker::kBadTaskId;
   }
 }
+
+void HistoryMenuBridge::OnURLVisited(HistoryService* history_service,
+                                     ui::PageTransition transition,
+                                     const history::URLRow& row,
+                                     const history::RedirectList& redirects,
+                                     base::Time visit_time) {
+  OnHistoryChanged();
+}
+
+void HistoryMenuBridge::OnURLsModified(HistoryService* history_service,
+                                       const history::URLRows& changed_urls) {
+  OnHistoryChanged();
+}
+
+void HistoryMenuBridge::OnURLsDeleted(HistoryService* history_service,
+                                      bool all_history,
+                                      bool expired,
+                                      const history::URLRows& deleted_rows,
+                                      const std::set<GURL>& favicon_urls) {
+  OnHistoryChanged();
+}
+
+void HistoryMenuBridge::OnHistoryServiceLoaded(
+    HistoryService* history_service) {
+  history_service_ = history_service;
+  Init();
+}