Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Unified Diff: chrome/browser/ui/cocoa/history_menu_bridge.mm

Issue 773103004: Remove NOTIFICATION_HISTORY_URLS_DELETED (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove NotificationObserver from InMemoryURLIndex Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/history_menu_bridge.mm
diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm
index 1f43718a276b4743154cabee24a627d6be80d9d6..98b4e3bbe81df0c305bd2c976149068b988eff47 100644
--- a/chrome/browser/ui/cocoa/history_menu_bridge.mm
+++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm
@@ -17,8 +17,6 @@
#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"
@@ -112,10 +110,6 @@ HistoryMenuBridge::HistoryMenuBridge(Profile* profile)
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);
@@ -129,15 +123,6 @@ HistoryMenuBridge::~HistoryMenuBridge() {
}
}
-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();
@@ -249,25 +234,6 @@ void HistoryMenuBridge::BuildMenu() {
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);
@@ -355,8 +321,6 @@ NSMenuItem* HistoryMenuBridge::AddItemToMenu(HistoryItem* item,
void HistoryMenuBridge::Init() {
DCHECK(history_service_);
- registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED,
- content::Source<Profile>(profile_));
}
void HistoryMenuBridge::CreateMenu() {
@@ -469,3 +433,28 @@ void HistoryMenuBridge::CancelFaviconRequest(HistoryItem* item) {
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,
+ const history::URLsDeletedDetails& deleted_details) {
+ OnHistoryChanged();
+}
+
+void HistoryMenuBridge::OnHistoryServiceLoaded(
+ HistoryService* history_service) {
+ history_service_ = history_service;
+ Init();
+}

Powered by Google App Engine
This is Rietveld 408576698