Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/ui/browser_navigator.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/browser_navigator.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/status_bubble.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
@@ skipping 61 matching lines @@
 
 // Returns a Browser that can host the navigation or tab addition specified in
 // |params|. This might just return the same Browser specified in |params|, or
 // some other if that Browser is deemed incompatible.
 Browser* GetBrowserForDisposition(browser::NavigateParams* params) {
   // If no source TabContents was specified, we use the selected one from
   // the target browser. This must happen first, before
   // GetBrowserForDisposition() has a chance to replace |params->browser| with
   // another one.
   if (!params->source_contents && params->browser)
-    params->source_contents =
-        params->browser->GetActiveTabContents();
+    params->source_contents = chrome::GetActiveTabContents(params->browser);
 
   Profile* profile =
       params->browser ? params->browser->profile() : params->profile;
 
   switch (params->disposition) {
     case CURRENT_TAB:
       if (!params->browser && profile) {
         // We specified a profile instead of a browser; find or create one.
         params->browser = browser::FindOrCreateTabbedBrowser(profile);
       }
@@ skipping 376 matching lines @@
       params->transition = content::PageTransitionFromInt(
           params->transition | content::PAGE_TRANSITION_HOME_PAGE);
     } else {
       url = params->url;
     }
 
     if (params->disposition != CURRENT_TAB) {
       WebContents* source_contents = params->source_contents ?
           params->source_contents->web_contents() : NULL;
       params->target_contents =
-          Browser::TabContentsFactory(
+          chrome::TabContentsFactory(
               params->browser->profile(),
               tab_util::GetSiteInstanceForNewTab(
                   params->browser->profile(), url),
               MSG_ROUTING_NONE,
               source_contents,
               NULL);
       // This function takes ownership of |params->target_contents| until it
       // is added to a TabStripModel.
       target_contents_owner.TakeOwnership();
       params->target_contents->extension_tab_helper()->
@@ skipping 63 matching lines @@
         params->target_contents,
         params->tabstrip_index,
         params->transition,
         params->tabstrip_add_types);
     // Now that the |params->target_contents| is safely owned by the target
     // Browser's TabStripModel, we can release ownership.
     target_contents_owner.ReleaseOwnership();
   }
 
   if (singleton_index >= 0) {
-    WebContents* target = params->browser->GetWebContentsAt(singleton_index);
+    WebContents* target =
+        chrome::GetWebContentsAt(params->browser, singleton_index);
 
     if (target->IsCrashed()) {
       target->GetController().Reload(true);
     } else if (params->path_behavior == NavigateParams::IGNORE_AND_NAVIGATE &&
         target->GetURL() != params->url) {
       InitializeExtraHeaders(params, NULL, &extra_headers);
       LoadURLInContents(target, params->url, params, extra_headers);
     }
 
     // If the singleton tab isn't already selected, select it.
     if (params->source_contents != params->target_contents)
-      params->browser->ActivateTabAt(singleton_index, user_initiated);
+      chrome::ActivateTabAt(params->browser, singleton_index, user_initiated);
   }
 
   if (params->disposition != CURRENT_TAB) {
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_TAB_ADDED,
         content::Source<content::WebContentsDelegate>(params->browser),
         content::Details<WebContents>(params->target_contents->web_contents()));
   }
 }
 
 bool IsURLAllowedInIncognito(const GURL& url) {
   // Most URLs are allowed in incognito; the following are exceptions.
   // chrome://extensions is on the list because it redirects to
   // chrome://settings.
 
   return !(url.scheme() == chrome::kChromeUIScheme &&
       (url.host() == chrome::kChromeUISettingsHost ||
        url.host() == chrome::kChromeUISettingsFrameHost ||
        url.host() == chrome::kChromeUIExtensionsHost ||
        url.host() == chrome::kChromeUIBookmarksHost ||
        url.host() == chrome::kChromeUISyncPromoHost ||
        url.host() == chrome::kChromeUIUberHost));
 }
 
 }  // namespace browser