Remove NOTIFICATION_HISTORY_URL_VISITED

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"
@@ skipping 99 matching lines @@
 
 // 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_MODIFIED,
                       content::Source<Profile>(profile_));
-    registrar_.Remove(this, chrome::NOTIFICATION_HISTORY_URL_VISITED,
-                      content::Source<Profile>(profile_));
     registrar_.Remove(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED,
                       content::Source<Profile>(profile_));
+    history_service_->RemoveObserver(this);
   } else {
     registrar_.Remove(this, chrome::NOTIFICATION_HISTORY_LOADED,
                       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();
@@ skipping 17 matching lines @@
       Init();
 
       // Found our HistoryService, so stop listening for this notification.
       registrar_.Remove(this,
                         chrome::NOTIFICATION_HISTORY_LOADED,
                         content::Source<Profile>(profile_));
     }
   }
 
   // All other notification types that we observe indicate that the history has
-  // changed and we need to rebuild.
-  need_recreate_ = true;
-  CreateMenu();
+  // changed.
+  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.
@@ skipping 93 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();
+}
+
 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 66 matching lines @@
       base::SysUTF16ToNSString(full_title), base::SysUTF8ToNSString(url)];
   [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_MODIFIED,
                  content::Source<Profile>(profile_));
-  registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URL_VISITED,
-                 content::Source<Profile>(profile_));
   registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED,
                  content::Source<Profile>(profile_));
+  history_service_->AddObserver(this);
 }
 
 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_);
 
   history::QueryOptions options;
   options.max_count = kVisitedCount;
   options.SetRecentDayRange(kVisitedScope);
 
   history_service_->QueryHistory(
       base::string16(),
       options,
       base::Bind(&HistoryMenuBridge::OnVisitedHistoryResults,
                  base::Unretained(this)),
       &cancelable_task_tracker_);
 }
 
+void HistoryMenuBridge::OnHistoryChanged() {
+  // History has changed, rebuild menu.
+  need_recreate_ = true;
+  CreateMenu();
+}
+
 void HistoryMenuBridge::OnVisitedHistoryResults(
     history::QueryResults* results) {
   NSMenu* menu = HistoryMenu();
   ClearMenuSection(menu, kVisited);
   NSInteger top_item = [menu indexOfItemWithTag:kVisitedTitle] + 1;
 
   size_t count = results->size();
   for (size_t i = 0; i < count; ++i) {
     const history::URLResult& result = (*results)[i];
 
@@ skipping 63 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;
   }
 }