Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/ui/startup/startup_browser_creator_impl.cc

 // Copyright (c) 2012 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/startup/startup_browser_creator_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 26 matching lines @@
 #include "chrome/browser/protector/protector_service.h"
 #include "chrome/browser/protector/protector_service_factory.h"
 #include "chrome/browser/protector/protector_utils.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
+#include "chrome/browser/ui/browser_tabrestore.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/startup/autolaunch_prompt.h"
 #include "chrome/browser/ui/startup/bad_flags_prompt.h"
 #include "chrome/browser/ui/startup/default_browser_prompt.h"
 #include "chrome/browser/ui/startup/obsolete_os_prompt.h"
 #include "chrome/browser/ui/startup/session_crashed_prompt.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
@@ skipping 632 matching lines @@
         (profile_ && profile_->GetProtocolHandlerRegistry()->IsHandledProtocol(
             tabs[i].url.scheme()));
     if (!process_startup && !handled_by_chrome)
       continue;
 
     int add_types = first_tab ? TabStripModel::ADD_ACTIVE :
                                 TabStripModel::ADD_NONE;
     add_types |= TabStripModel::ADD_FORCE_INDEX;
     if (tabs[i].is_pinned)
       add_types |= TabStripModel::ADD_PINNED;
-    int index = browser->GetIndexForInsertionDuringRestore(i);
+    int index = chrome::GetIndexForInsertionDuringRestore(browser, i);
 
     browser::NavigateParams params(browser, tabs[i].url,
                                    content::PAGE_TRANSITION_START_PAGE);
     params.disposition = first_tab ? NEW_FOREGROUND_TAB :
                                      NEW_BACKGROUND_TAB;
     params.tabstrip_index = index;
     params.tabstrip_add_types = add_types;
     params.extension_app_id = tabs[i].app_id;
     browser::Navigate(&params);
 
     first_tab = false;
   }
-  if (!browser->GetActiveWebContents()) {
+  if (!chrome::GetActiveWebContents(browser)) {
     // TODO: this is a work around for 110909. Figure out why it's needed.
     if (!browser->tab_count())
       browser->AddBlankTab(true);
     else
-      browser->ActivateTabAt(0, false);
+      chrome::ActivateTabAt(browser, 0, false);
   }
 
   browser->window()->Show();
   // TODO(jcampan): http://crbug.com/8123 we should not need to set the initial
   //                focus explicitly.
-  browser->GetActiveWebContents()->GetView()->SetInitialFocus();
+  chrome::GetActiveWebContents(browser)->GetView()->SetInitialFocus();
 
   return browser;
 }
 
 void StartupBrowserCreatorImpl::AddInfoBarsIfNecessary(
     Browser* browser,
     browser::startup::IsProcessStartup is_process_startup) {
   if (!browser || !profile_ || browser->tab_count() == 0)
     return;
 
@@ skipping 125 matching lines @@
         // New:
         prefs->GetString(prefs::kHomePage),
         prefs->GetBoolean(prefs::kHomePageIsNewTabPage),
         prefs->GetBoolean(prefs::kShowHomeButton),
         // Backup:
         backup_homepage,
         backup_homepage_is_ntp,
         backup_show_home_button));
   }
 }