Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/extensions/api/tabs/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/extensions/api/tabs/tabs.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
@@ skipping 20 matching lines @@
 #include "chrome/browser/extensions/script_executor.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.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_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/shell_window.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/snapshot_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/window_sizer/window_sizer.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 567 matching lines @@
         web_app::GenerateApplicationNameFromExtensionId(extension_id),
         (window_type == Browser::TYPE_PANEL ? panel_bounds : popup_bounds),
         window_profile);
   }
   create_params.initial_show_state = ui::SHOW_STATE_NORMAL;
 
   Browser* new_window = CreateBrowserWindow(create_params, window_profile,
                                             extension_id);
 
   for (std::vector<GURL>::iterator i = urls.begin(); i != urls.end(); ++i) {
-    TabContents* tab = new_window->AddSelectedTabWithURL(
-        *i, content::PAGE_TRANSITION_LINK);
+    TabContents* tab = chrome::AddSelectedTabWithURL(
+        new_window, *i, content::PAGE_TRANSITION_LINK);
     if (window_type == Browser::TYPE_PANEL)
       tab->extension_tab_helper()->SetExtensionAppIconById(extension_id);
   }
   if (contents) {
     TabStripModel* target_tab_strip = new_window->tab_strip_model();
     target_tab_strip->InsertTabContentsAt(urls.size(), contents,
                                           TabStripModel::ADD_NONE);
   } else if (urls.empty()) {
     chrome::NewTab(new_window);
   }
@@ skipping 753 matching lines @@
     Browser* source_browser = NULL;
     TabStripModel* source_tab_strip = NULL;
     TabContents* contents = NULL;
     int tab_index = -1;
     if (!GetTabById(tab_ids[i], profile(), include_incognito(),
                     &source_browser, &source_tab_strip, &contents,
                     &tab_index, &error_))
       return false;
 
     // Don't let the extension move the tab if the user is dragging tabs.
-    if (!source_browser->IsTabStripEditable()) {
+    if (!chrome::IsTabStripEditable(source_browser)) {
       error_ = keys::kTabStripNotEditableError;
       return false;
     }
 
     // Insert the tabs one after another.
     new_index += i;
 
     if (update_props->HasKey(keys::kWindowIdKey)) {
       Browser* target_browser = NULL;
       int window_id = extension_misc::kUnknownWindowId;
       EXTENSION_FUNCTION_VALIDATE(update_props->GetInteger(
           keys::kWindowIdKey, &window_id));
 
       if (!GetBrowserFromWindowID(this, window_id, &target_browser))
         return false;
 
-      if (!target_browser->IsTabStripEditable()) {
+      if (!chrome::IsTabStripEditable(target_browser)) {
         error_ = keys::kTabStripNotEditableError;
         return false;
       }
 
       if (!target_browser->is_type_tabbed()) {
         error_ = keys::kCanOnlyMoveTabsWithinNormalWindowsError;
         return false;
       }
 
       if (target_browser->profile() != source_browser->profile()) {
@@ skipping 123 matching lines @@
       tab_value, &tab_ids));
 
   for (size_t i = 0; i < tab_ids.size(); ++i) {
     Browser* browser = NULL;
     TabContents* contents = NULL;
     if (!GetTabById(tab_ids[i], profile(), include_incognito(),
                     &browser, NULL, &contents, NULL, &error_))
       return false;
 
     // Don't let the extension remove a tab if the user is dragging tabs around.
-    if (!browser->IsTabStripEditable()) {
+    if (!chrome::IsTabStripEditable(browser)) {
       error_ = keys::kTabStripNotEditableError;
       return false;
     }
 
     // There's a chance that the tab is being dragged, or we're in some other
     // nested event loop. This code path ensures that the tab is safely closed
-    // under such circumstances, whereas |Browser::CloseTabContents()| does not.
+    // under such circumstances, whereas |chrome::CloseWebContents()| does not.
     contents->web_contents()->Close();
   }
   return true;
 }
 
 bool CaptureVisibleTabFunction::GetTabToCapture(
     WebContents** web_contents, TabContents** tab_contents) {
   Browser* browser = NULL;
   // windowId defaults to "current" window.
   int window_id = extension_misc::kCurrentWindowId;
 
   if (HasOptionalArgument(0))
     EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &window_id));
 
   if (!GetBrowserFromWindowID(this, window_id, &browser))
     return false;
 
-  *web_contents = browser->GetActiveWebContents();
+  *web_contents = chrome::GetActiveWebContents(browser);
   if (*web_contents == NULL) {
     error_ = keys::kInternalVisibleTabCaptureError;
     return false;
   }
 
-  *tab_contents = browser->GetActiveTabContents();
+  *tab_contents = chrome::GetActiveTabContents(browser);
 
   return true;
 };
 
 bool CaptureVisibleTabFunction::RunImpl() {
   WebContents* web_contents = NULL;
   TabContents* tab_contents = NULL;
   if (!GetTabToCapture(&web_contents, &tab_contents))
     return false;
 
@@ skipping 219 matching lines @@
   // called for every API call the extension made.
   GotLanguage(language);
 }
 
 void DetectTabLanguageFunction::GotLanguage(const std::string& language) {
   result_.reset(Value::CreateStringValue(language.c_str()));
   SendResponse(true);
 
   Release();  // Balanced in Run()
 }