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

Unified Diff: chrome/browser/cocoa/history_menu_bridge.h

Issue 3296003: FBTF: Move the TabRestoreService::Observer into its own file. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: More mac fixes Created 10 years, 4 months 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
« no previous file with comments | « chrome/browser/browser.cc ('k') | chrome/browser/cocoa/history_menu_bridge.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/history_menu_bridge.h
diff --git a/chrome/browser/cocoa/history_menu_bridge.h b/chrome/browser/cocoa/history_menu_bridge.h
index 55dab4d48e40270f71ab5b9968f493ec753895b6..2743752367f96489aa98e4c83f5f97321e41a96d 100644
--- a/chrome/browser/cocoa/history_menu_bridge.h
+++ b/chrome/browser/cocoa/history_menu_bridge.h
@@ -16,6 +16,7 @@
#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;
@@ -23,6 +24,7 @@ class NotificationRegistrar;
class PageUsageData;
class Profile;
class TabNavigationEntry;
+class TabRestoreService;
@class HistoryMenuCocoaController;
namespace {
@@ -54,26 +56,16 @@ class HistoryMenuBridgeTest;
// 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 TabRestoreService::Observer {
+ public TabRestoreServiceObserver {
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()
- : icon_requested(false),
- menu_item(nil),
- session_id(0) {}
-
+ HistoryItem();
// Copy constructor allowed.
- HistoryItem(const HistoryItem& copy)
- : title(copy.title),
- url(copy.url),
- icon_requested(false),
- menu_item(nil),
- session_id(copy.session_id) {}
-
- ~HistoryItem() {}
+ HistoryItem(const HistoryItem& copy);
+ ~HistoryItem();
// The title for the menu item.
string16 title;
@@ -136,7 +128,7 @@ class HistoryMenuBridge : public NotificationObserver,
const NotificationSource& source,
const NotificationDetails& details);
- // For TabRestoreService::Observer
+ // For TabRestoreServiceObserver
virtual void TabRestoreServiceChanged(TabRestoreService* service);
virtual void TabRestoreServiceDestroyed(TabRestoreService* service);
« no previous file with comments | « chrome/browser/browser.cc ('k') | chrome/browser/cocoa/history_menu_bridge.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698