Decouple TabRestoreService from Browser

chrome/browser/ui/browser.h

Index: chrome/browser/ui/browser.h
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 8427344163191a1a50e807411b30a24b11402560..62e64ceb03fc180e71289219f4d4dc0d602e53bb 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -28,6 +28,7 @@
 #include "chrome/browser/tabs/tab_strip_model_delegate.h"  // TODO(beng): remove
 #include "chrome/browser/tabs/tab_strip_model_observer.h"  // TODO(beng): remove
 #include "chrome/browser/ui/browser_navigator.h"
+#include "chrome/browser/ui/browser_tab_restore_service_delegate.h"

[sky, 2011/03/11 17:40:37]

Forward declare and use a scoped_ptr.

[torne_google.com, 2011/03/14 15:07:25]

Done.

 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
 #include "chrome/browser/ui/shell_dialogs.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
@@ -201,6 +202,9 @@ class Browser : public TabHandlerDelegate,
   const SessionID& session_id() const { return session_id_; }
   CommandUpdater* command_updater() { return &command_updater_; }
   bool block_command_execution() const { return block_command_execution_; }
+  TabRestoreServiceDelegate* tab_restore_service_delegate() {
+    return &tab_restore_service_delegate_;
+  }
 
   // Get the FindBarController for this browser, creating it if it does not
   // yet exist.
@@ -348,6 +352,7 @@ class Browser : public TabHandlerDelegate,
   TabContents* GetSelectedTabContents() const;
   TabContents* GetTabContentsAt(int index) const;
   void SelectTabContentsAt(int index, bool user_gesture);
+  bool IsTabPinned(int index) const;
   void CloseAllTabs();
 
   // Tab adding/showing functions /////////////////////////////////////////////
@@ -1151,6 +1156,9 @@ class Browser : public TabHandlerDelegate,
   // and we install ourselves as an observer.
   TabRestoreService* tab_restore_service_;
 
+  // Helper which implements the TabRestoreServiceDelegate interface.
+  BrowserTabRestoreServiceDelegate tab_restore_service_delegate_;
+
   scoped_ptr<InstantController> instant_;
   scoped_ptr<InstantUnloadHandler> instant_unload_handler_;