Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/ui/views/tabs/browser_tab_strip_controller.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/views/tabs/browser_tab_strip_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/search/search_delegate.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_menu_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_selection_model.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
@@ skipping 415 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserTabStripController, chrome::search::SearchModelObserver:
 
 void BrowserTabStripController::ModeChanged(const chrome::search::Mode& mode) {
   // Mode has changed, set tab data based on new mode, which will trigger
   // repainting of tab's background.
   int active_index = GetActiveIndex();
   DCHECK_NE(active_index, -1);
-  SetTabDataAt(browser_->GetTabContentsAt(active_index), active_index);
+  SetTabDataAt(chrome::GetTabContentsAt(browser_, active_index), active_index);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserTabStripController, chrome::search::ToolbarSearchAnimator::Observer:
 
 void BrowserTabStripController::OnToolbarBackgroundAnimatorProgressed() {
   // We're fading in the tab background, set tab data based on new background
   // state and possibly opacity value, which will trigger repainting of tab's
   // background.
   int active_index = GetActiveIndex();
   DCHECK_NE(active_index, -1);
-  SetTabDataAt(browser_->GetTabContentsAt(active_index), active_index);
+  SetTabDataAt(chrome::GetTabContentsAt(browser_, active_index), active_index);
 }
 
 void BrowserTabStripController::OnToolbarBackgroundAnimatorCanceled(
     TabContents* tab_contents) {
   // Fade in of tab background has been canceled, which can happen in 2
   // scenarios:
   // 1) a deactivated or detached or closing tab, whose |tab_contents| is the
   //    the formal parameter: make sure |tab_contents| still exist in tab model.
   // 2) mode change of active tab, as indicated by a NULL |tab_contents|: make
   //    sure active tab exists, and retrieve its |tab_contents|.
   // If we proceed, set tab data so that |TabRendererData::background_state| and
   // |TabRendererData::search_background_opacity| will be reset.
   // Repainting of tab's background will be triggered in the process.
   int index = tab_contents ? model_->GetIndexOfTabContents(tab_contents) :
                              GetActiveIndex();
   if (index == -1)
     return;
-  SetTabDataAt(tab_contents ? tab_contents : browser_->GetTabContentsAt(index),
-               index);
+  SetTabDataAt(tab_contents ? tab_contents :
+      chrome::GetTabContentsAt(browser_, index), index);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserTabStripController, content::NotificationObserver implementation:
 
 void BrowserTabStripController::Observe(int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_PREF_CHANGED:
@@ skipping 92 matching lines @@
   SetTabRendererDataFromModel(contents->web_contents(), index, &data, NEW_TAB);
   tabstrip_->AddTabAt(index, data, is_active);
 }
 
 void BrowserTabStripController::UpdateLayoutType() {
   bool adjust_layout = false;
   TabStripLayoutType layout_type =
       DetermineTabStripLayout(g_browser_process->local_state(), &adjust_layout);
   tabstrip_->SetLayoutType(layout_type, adjust_layout);
 }