Remove tabstrip wrappers in browser_tabstrip.

Remove tabstrip wrappers in browser_tabstrip.

BUG=none
TEST=no functional change


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=168076

[Avi (use Gerrit), 2012-11-14 22:47:52]

I'm no fan of functions that are just wrappers, so I'm killing them in
browser_tabstrip; this is half the job. If this LG to you, then forthcoming will
be the rest of the wrappers in this file, plus tab_count and active_index from
Browser.

[Ben Goodger (Google), 2012-11-15 17:05:17]

cool. lgtm.

[commit-bot: I haz the power, 2012-11-15 18:49:31]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/11364239/6001

[commit-bot: I haz the power, 2012-11-15 18:49:41]

Failed to apply patch for chrome/browser/ui/browser_tabstrip.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/ui/browser_tabstrip.cc
  Hunk #3 FAILED at 68.
  Hunk #4 succeeded at 82 with fuzz 1 (offset 1 line).
  Hunk #5 succeeded at 135 (offset 1 line).
  Hunk #6 succeeded at 160 (offset 1 line).
  1 out of 6 hunks FAILED -- saving rejects to file
chrome/browser/ui/browser_tabstrip.cc.rej

Patch:       chrome/browser/ui/browser_tabstrip.cc
Index: chrome/browser/ui/browser_tabstrip.cc
diff --git a/chrome/browser/ui/browser_tabstrip.cc
b/chrome/browser/ui/browser_tabstrip.cc
index
9273b7cc1e957b1c69dcc90d6e2ee16cd7cac5af..0a9401d9b0610f1cee2633a0e76fefbb5f831116
100644
--- a/chrome/browser/ui/browser_tabstrip.cc
+++ b/chrome/browser/ui/browser_tabstrip.cc
@@ -9,7 +9,6 @@
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.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_switches.h"
@@ -28,11 +27,6 @@ class BrowserTabstripTabContentsCreator {
 
 namespace chrome {
 
-int GetIndexOfTab(const Browser* browser,
-                  const content::WebContents* contents) {
-  return browser->tab_strip_model()->GetIndexOfWebContents(contents);
-}
-
 TabContents* GetActiveTabContents(const Browser* browser) {
   return browser->tab_strip_model()->GetActiveTabContents();
 }
@@ -74,10 +68,6 @@ void AddBlankTabAt(Browser* browser, int index, bool
foreground) {
       new_tab_start_time);
 }
 
-bool IsTabStripEditable(Browser* browser) {
-  return browser->window()->IsTabStripEditable();
-}
-
 TabContents* AddSelectedTabWithURL(Browser* browser,
                                    const GURL& url,
                                    content::PageTransition transition) {
@@ -87,13 +77,6 @@ TabContents* AddSelectedTabWithURL(Browser* browser,
   return params.target_contents;
 }
 
-void AddTab(Browser* browser,
-            TabContents* tab_contents,
-            content::PageTransition type) {
-  browser->tab_strip_model()->AddTabContents(tab_contents, -1, type,
-                                             TabStripModel::ADD_ACTIVE);
-}
-
 void AddWebContents(Browser* browser,
                     content::WebContents* source_contents,
                     content::WebContents* new_contents,
@@ -147,8 +130,13 @@ void AddWebContents(Browser* browser,
   }
 
   NavigateParams params(browser, new_tab_contents);
-  params.source_contents = source_contents ?
-      GetTabContentsAt(browser, GetIndexOfTab(browser, source_contents)) :
NULL;
+  if (source_contents) {
+    TabStripModel* tab_strip_model = browser->tab_strip_model();
+    params.source_contents = tab_strip_model->GetTabContentsAt(
+        tab_strip_model->GetIndexOfWebContents(source_contents));
+  } else {
+    params.source_contents = NULL;
+  }
   params.disposition = disposition;
   params.window_bounds = initial_pos;
   params.window_action = NavigateParams::SHOW_WINDOW;
@@ -167,10 +155,6 @@ void CloseWebContents(Browser* browser,
content::WebContents* contents) {
       TabStripModel::CLOSE_CREATE_HISTORICAL_TAB);
 }
 
-void CloseAllTabs(Browser* browser) {
-  browser->tab_strip_model()->CloseAllTabs();
-}
-
 TabContents* TabContentsFactory(
     Profile* profile,
     content::SiteInstance* site_instance,

[commit-bot: I haz the power, 2012-11-15 20:53:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/11364239/12001

[commit-bot: I haz the power, 2012-11-15 21:15:21]

Sorry for I got bad news for ya.
Compile failed with a clobber build on android_dbg.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2012-11-15 21:54:24]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/11364239/12001

[commit-bot: I haz the power, 2012-11-15 23:34:04]

Change committed as 168076