Decouple TabRestoreService from Browser

chrome/browser/ui/browser.cc

 // 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.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include <windows.h>
 #endif  // OS_WIN
@@ skipping 313 matching lines @@
 }
 
 // static
 Browser* Browser::Create(Profile* profile) {
   Browser* browser = new Browser(TYPE_NORMAL, profile);
   browser->CreateBrowserWindow();
   return browser;
 }
 
 // static
+TabRestoreServiceDelegate* TabRestoreServiceDelegate::Create(Profile* profile) {
+  return Browser::Create(profile);
+}
+
+// static
 Browser* Browser::CreateForPopup(Type type,
                                  Profile* profile,
                                  TabContents* new_contents,
                                  const gfx::Rect& initial_bounds) {
   DCHECK(type & TYPE_POPUP);
   Browser* browser = new Browser(type, profile);
   browser->set_override_bounds(initial_bounds);
   browser->CreateBrowserWindow();
   TabContentsWrapper* wrapper = new TabContentsWrapper(new_contents);
   browser->tabstrip_model()->AppendTabContents(wrapper, true);
@@ skipping 615 matching lines @@
   TabContentsWrapper* wrapper = tabstrip_model()->GetTabContentsAt(index);
   if (wrapper)
     return wrapper->tab_contents();
   return NULL;
 }
 
 void Browser::SelectTabContentsAt(int index, bool user_gesture) {
   tab_handler_->GetTabStripModel()->SelectTabContentsAt(index, user_gesture);
 }
 
+bool Browser::IsTabPinned(int index) const {
+  return tabstrip_model()->IsTabPinned(index);
+}
+
 void Browser::CloseAllTabs() {
   tab_handler_->GetTabStripModel()->CloseAllTabs();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Browser, Tab adding/showing functions:
 
 bool Browser::IsTabStripEditable() const {
   return window()->IsTabStripEditable();
 }
@@ skipping 1109 matching lines @@
     if (index != TabStripModel::kNoTab) {
       if (index_result)
         *index_result = index;
       return *it;
     }
   }
 
   return NULL;
 }
 
+// static
+TabRestoreServiceDelegate* TabRestoreServiceDelegate::GetBrowserForController(
+    const NavigationController* controller, int* index) {
+  return Browser::GetBrowserForController(controller, index);
+}
+
 void Browser::ExecuteCommandWithDisposition(
   int id, WindowOpenDisposition disposition) {
   // No commands are enabled if there is not yet any selected tab.
   // TODO(pkasting): It seems like we should not need this, because either
   // most/all commands should not have been enabled yet anyway or the ones that
   // are enabled should be global, or safe themselves against having no selected
   // tab.  However, Ben says he tried removing this before and got lots of
   // crashes, e.g. from Windows sending WM_COMMANDs at random times during
   // window construction.  This probably could use closer examination someday.
   if (!GetSelectedTabContentsWrapper())
@@ skipping 2278 matching lines @@
     // The page transition below is only for the purpose of inserting the tab.
     browser->AddTab(view_source_contents, PageTransition::LINK);
   }
 
   if (profile_->HasSessionService()) {
     SessionService* session_service = profile_->GetSessionService();
     if (session_service)
       session_service->TabRestored(&view_source_contents->controller(), false);
   }
 }