Remove NOTIFICATION_HISTORY_URL_VISITED

chrome/browser/ui/cocoa/history_menu_bridge.h

 // Copyright (c) 2011 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_COCOA_HISTORY_MENU_BRIDGE_H_
 #define CHROME_BROWSER_UI_COCOA_HISTORY_MENU_BRIDGE_H_
 
 #import <Cocoa/Cocoa.h>
 #include <map>
 #include <vector>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/ref_counted.h"
 #include "base/task/cancelable_task_tracker.h"
 #import "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
 #import "chrome/browser/ui/cocoa/main_menu_item.h"
+#include "components/history/core/browser/history_service_observer.h"
 #include "components/sessions/session_id.h"
 #include "content/public/browser/notification_observer.h"
 
 class NotificationRegistrar;
 class PageUsageData;
 class Profile;
 class TabRestoreService;
 @class HistoryMenuCocoaController;
 
 namespace {
@@ skipping 21 matching lines @@
 // action mechanism.
 //
 // These menu items do not use firstResponder as their target. Rather, they are
 // hooked directly up to the HistoryMenuCocoaController that then bridges back
 // to this class. These items are created via the AddItemToMenu() helper. Also,
 // unlike the typical ownership model, this bridge owns its controller. The
 // controller is very thin and only exists to interact with Cocoa, but this
 // class does the bulk of the work.
 class HistoryMenuBridge : public content::NotificationObserver,
                           public TabRestoreServiceObserver,
-                          public MainMenuItem {
+                          public MainMenuItem,
+                          public history::HistoryServiceObserver {
  public:
   // This is a generalization of the data we store in the history menu because
   // we pull things from different sources with different data types.
   struct HistoryItem {
    public:
     HistoryItem();
     // Copy constructor allowed.
     HistoryItem(const HistoryItem& copy);
     ~HistoryItem();
 
@@ skipping 52 matching lines @@
   };
 
   explicit HistoryMenuBridge(Profile* profile);
   virtual ~HistoryMenuBridge();
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) override;
 
+  // history::HistoryServiceObserver:

[Peter Kasting, 2014/10/17 20:41:03]

Nit: Please place overrides for classes in the same order as the classes are
declared in lines 60-63

+  virtual void OnURLVisited(HistoryService* history_service,
+                            ui::PageTransition transition,
+                            const history::URLRow& row,
+                            const history::RedirectList& redirects,
+                            base::Time visit_time) override;
+
   // TabRestoreServiceObserver:
   virtual void TabRestoreServiceChanged(TabRestoreService* service) override;
   virtual void TabRestoreServiceDestroyed(TabRestoreService* service) override;
 
   // MainMenuItem:
   virtual void ResetMenu() override;
   virtual void BuildMenu() override;
 
   // Looks up an NSMenuItem in the |menu_item_map_| and returns the
   // corresponding HistoryItem.
@@ skipping 25 matching lines @@
                             NSInteger index);
 
   // Called by the ctor if |service_| is ready at the time, or by a
   // notification receiver. Finishes initialization tasks by subscribing for
   // change notifications and calling CreateMenu().
   void Init();
 
   // Does the query for the history information to create the menu.
   void CreateMenu();
 
+  // Invoked when the History information has changed.
+  void OnHistoryChanged();
+
   // Callback method for when HistoryService query results are ready with the
   // most recently-visited sites.
   void OnVisitedHistoryResults(history::QueryResults* results);
 
   // Creates a HistoryItem* for the given tab entry. Caller takes ownership of
   // the result and must delete it when finished.
   HistoryItem* HistoryItemForTab(const TabRestoreService::Tab& entry);
 
   // Helper function that sends an async request to the FaviconService to get
   // an icon. The callback will update the NSMenuItem directly.
@@ skipping 34 matching lines @@
   bool create_in_progress_;
   bool need_recreate_;
 
   // The default favicon if a HistoryItem does not have one.
   base::scoped_nsobject<NSImage> default_favicon_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryMenuBridge);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_HISTORY_MENU_BRIDGE_H_