Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/ui/singleton_tabs.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/singleton_tabs.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_url_handler.h"
 #include "content/public/browser/web_contents.h"
 
 namespace chrome {
 namespace {
 
 // Returns true if two URLs are equal after taking |replacements| into account.
 bool CompareURLsWithReplacements(
@@ skipping 17 matching lines @@
 
 void ShowSingletonTabRespectRef(Browser* browser, const GURL& url) {
   browser::NavigateParams params(GetSingletonTabNavigateParams(browser, url));
   params.ref_behavior = browser::NavigateParams::RESPECT_REF;
   browser::Navigate(&params);
 }
 
 void ShowSingletonTabOverwritingNTP(Browser* browser,
                                     const browser::NavigateParams& params) {
   browser::NavigateParams local_params(params);
-  content::WebContents* contents = browser->GetActiveWebContents();
+  content::WebContents* contents = chrome::GetActiveWebContents(browser);
   if (contents) {
     const GURL& contents_url = contents->GetURL();
     if ((contents_url == GURL(chrome::kChromeUINewTabURL) ||
          contents_url == GURL(chrome::kAboutBlankURL)) &&
         GetIndexOfSingletonTab(&local_params) < 0) {
       local_params.disposition = CURRENT_TAB;
     }
   }
 
   browser::Navigate(&local_params);
@@ skipping 24 matching lines @@
   content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
       &rewritten_url,
       params->browser->profile(),
       &reverse_on_redirect);
 
   // If there are several matches: prefer the active tab by starting there.
   int start_index = std::max(0, params->browser->active_index());
   int tab_count = params->browser->tab_count();
   for (int i = 0; i < tab_count; ++i) {
     int tab_index = (start_index + i) % tab_count;
-    TabContents* tab = params->browser->GetTabContentsAt(tab_index);
+    TabContents* tab = chrome::GetTabContentsAt(params->browser, tab_index);
 
     url_canon::Replacements<char> replacements;
     if (params->ref_behavior == browser::NavigateParams::IGNORE_REF)
       replacements.ClearRef();
     if (params->path_behavior == browser::NavigateParams::IGNORE_AND_NAVIGATE ||
         params->path_behavior == browser::NavigateParams::IGNORE_AND_STAY_PUT) {
       replacements.ClearPath();
       replacements.ClearQuery();
     }
 
     if (CompareURLsWithReplacements(tab->web_contents()->GetURL(),
                                     params->url, replacements) ||
         CompareURLsWithReplacements(tab->web_contents()->GetURL(),
                                     rewritten_url, replacements)) {
       params->target_contents = tab;
       return tab_index;
     }
   }
 
   return -1;
 }
 
 
 }  // namespace chrome