Revert "FBTF: Move the TabRestoreService::Observer into its own file."

chrome/browser/cocoa/history_menu_bridge.h

 // Copyright (c) 2010 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_COCOA_HISTORY_MENU_BRIDGE_H_
 #define CHROME_BROWSER_COCOA_HISTORY_MENU_BRIDGE_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
 #include <map>
 
 #include "base/ref_counted.h"
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/cancelable_request.h"
 #import "chrome/browser/favicon_service.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
-#include "chrome/browser/sessions/tab_restore_service_observer.h"
 #include "chrome/common/notification_observer.h"
 
 class NavigationEntry;
 class NotificationRegistrar;
 class PageUsageData;
 class Profile;
 class TabNavigationEntry;
-class TabRestoreService;
 @class HistoryMenuCocoaController;
 
 namespace {
 
 class HistoryMenuBridgeTest;
 
 }
 
 // C++ bridge for the history menu; one per AppController (means there
 // is only one). This class observes various data sources, namely the
@@ skipping 11 matching lines @@
 // a range of [400,500) and do not go through CommandDispatch for their target-
 // 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 NotificationObserver,
-                          public TabRestoreServiceObserver {
+                          public TabRestoreService::Observer {
  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();
+    HistoryItem()
+        : icon_requested(false),
+          menu_item(nil),
+          session_id(0) {}
+
     // Copy constructor allowed.
-    HistoryItem(const HistoryItem& copy);
-    ~HistoryItem();
+    HistoryItem(const HistoryItem& copy)
+        : title(copy.title),
+          url(copy.url),
+          icon_requested(false),
+          menu_item(nil),
+          session_id(copy.session_id) {}
+
+    ~HistoryItem() {}
 
     // The title for the menu item.
     string16 title;
     // The URL that will be navigated to if the user selects this item.
     GURL url;
     // Favicon for the URL.
     scoped_nsobject<NSImage> icon;
 
     // If the icon is being requested from the FaviconService, |icon_requested|
     // will be true and |icon_handle| will be non-NULL. If this is false, then
@@ skipping 42 matching lines @@
   };
 
   explicit HistoryMenuBridge(Profile* profile);
   virtual ~HistoryMenuBridge();
 
   // Overriden from NotificationObserver.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  // For TabRestoreServiceObserver
+  // For TabRestoreService::Observer
   virtual void TabRestoreServiceChanged(TabRestoreService* service);
   virtual void TabRestoreServiceDestroyed(TabRestoreService* service);
 
   // Looks up an NSMenuItem in the |menu_item_map_| and returns the
   // corresponding HistoryItem.
   HistoryItem* HistoryItemForMenuItem(NSMenuItem* item);
 
   // I wish I has a "friend @class" construct. These are used by the HMCC
   // to access model information when responding to actions.
   HistoryService* service();
@@ skipping 81 matching lines @@
   bool create_in_progress_;
   bool need_recreate_;
 
   // The default favicon if a HistoryItem does not have one.
   scoped_nsobject<NSImage> default_favicon_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryMenuBridge);
 };
 
 #endif  // CHROME_BROWSER_COCOA_HISTORY_MENU_BRIDGE_H_