Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/debugger/devtools_window.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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/devtools_agent_host_registry.h"
@@ skipping 131 matching lines @@
 }
 
 
 DevToolsWindow* DevToolsWindow::Create(
     Profile* profile,
     RenderViewHost* inspected_rvh,
     bool docked,
     bool shared_worker_frontend) {
   // Create TabContents with devtools.
   TabContents* tab_contents =
-      Browser::TabContentsFactory(profile, NULL, MSG_ROUTING_NONE, NULL, NULL);
+      chrome::TabContentsFactory(profile, NULL, MSG_ROUTING_NONE, NULL, NULL);
   tab_contents->web_contents()->GetRenderViewHost()->AllowBindings(
       content::BINDINGS_POLICY_WEB_UI);
   tab_contents->web_contents()->GetController().LoadURL(
       GetDevToolsUrl(profile, docked, shared_worker_frontend),
       content::Referrer(),
       content::PAGE_TRANSITION_START_PAGE,
       std::string());
   return new DevToolsWindow(tab_contents, profile, inspected_rvh, docked);
 }
 
@@ skipping 63 matching lines @@
     // In case of docked tab_contents we own it, so delete here.
     delete tab_contents_;
 
     delete this;
   } else {
     // First, initiate self-destruct to free all the registrars.
     // Then close all tabs. Browser will take care of deleting tab_contents
     // for us.
     Browser* browser = browser_;
     delete this;
-    browser->CloseAllTabs();
+    chrome::CloseAllTabs(browser);
   }
 }
 
 void DevToolsWindow::ContentsReplaced(WebContents* new_contents) {
   TabContents* new_tab_contents = TabContents::FromWebContents(new_contents);
   DCHECK(new_tab_contents);
   if (!new_tab_contents)
       return;
   DCHECK_EQ(profile_, new_tab_contents->profile());
   inspected_tab_ = new_tab_contents;
@@ skipping 110 matching lines @@
   browser_->tab_strip_model()->AddTabContents(
       tab_contents_, -1, content::PAGE_TRANSITION_START_PAGE,
       TabStripModel::ADD_ACTIVE);
 }
 
 bool DevToolsWindow::FindInspectedBrowserAndTabIndex(Browser** browser,
                                                      int* tab) {
   if (!inspected_tab_)
     return false;
 
-  const NavigationController& controller =
-      inspected_tab_->web_contents()->GetController();
   for (BrowserList::const_iterator it = BrowserList::begin();
        it != BrowserList::end(); ++it) {
-    int tab_index = (*it)->GetIndexOfController(&controller);
+    int tab_index = chrome::GetIndexOfTab(*it, inspected_tab_->web_contents());
     if (tab_index != TabStripModel::kNoTab) {
       *browser = *it;
       *tab = tab_index;
       return true;
     }
   }
   return false;
 }
 
 BrowserWindow* DevToolsWindow::GetInspectedBrowserWindow() {
@@ skipping 339 matching lines @@
   CallClientFunction("InspectorFrontendAPI.appendedToURL", &url_value);
 }
 
 content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() {
   if (inspected_tab_ && inspected_tab_->web_contents()->GetDelegate()) {
     return inspected_tab_->web_contents()->GetDelegate()->
         GetJavaScriptDialogCreator();
   }
   return content::WebContentsDelegate::GetJavaScriptDialogCreator();
 }