Remove TabContents from browser_commands API.

BUG=107201
TEST=no visible change


Review URL: https://chromiumcodereview.appspot.com/11416204

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169772 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 20 insertions, 23 deletions

diff --git a/chrome/browser/extensions/api/tabs/tabs.cc b/chrome/browser/extensions/api/tabs/tabs.cc
index 7a10127..31293b4 100644
--- a/chrome/browser/extensions/api/tabs/tabs.cc
+++ b/chrome/browser/extensions/api/tabs/tabs.cc
@@ -1123,15 +1123,15 @@ bool DuplicateTabFunction::RunImpl() {
     return false;
   }
 
-  TabContents* new_contents = chrome::DuplicateTabAt(browser, tab_index);
+  WebContents* new_contents = chrome::DuplicateTabAt(browser, tab_index);
   if (!has_callback())
     return true;
 
-  int new_index = tab_strip->GetIndexOfTabContents(new_contents);
+  int new_index = tab_strip->GetIndexOfWebContents(new_contents);
 
   // Return data about the newly created tab.
   SetResult(ExtensionTabUtil::CreateTabValue(
-      new_contents->web_contents(),
+      new_contents,
       tab_strip, new_index, GetExtension()));
 
   return true;
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index b8aa442..2d39b33 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1501,16 +1501,14 @@ void Browser::OnStartDownload(WebContents* source,
 
 void Browser::ViewSourceForTab(WebContents* source, const GURL& page_url) {
   DCHECK(source);
-  TabContents* tab_contents = TabContents::FromWebContents(source);
-  chrome::ViewSource(this, tab_contents);
+  chrome::ViewSource(this, source);
 }
 
 void Browser::ViewSourceForFrame(WebContents* source,
                                  const GURL& frame_url,
                                  const std::string& frame_content_state) {
   DCHECK(source);
-  TabContents* tab_contents = TabContents::FromWebContents(source);
-  chrome::ViewSource(this, tab_contents, frame_url, frame_content_state);
+  chrome::ViewSource(this, source, frame_url, frame_content_state);
 }
 
 void Browser::ShowRepostFormWarningDialog(WebContents* source) {
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 8886b03..6fd9f6c 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -565,7 +565,7 @@ bool CanDuplicateTab(const Browser* browser) {
   return contents && contents->GetController().GetLastCommittedEntry();
 }
 
-TabContents* DuplicateTabAt(Browser* browser, int index) {
+WebContents* DuplicateTabAt(Browser* browser, int index) {
   TabContents* contents = browser->tab_strip_model()->GetTabContentsAt(index);
   CHECK(contents);
   TabContents* contents_dupe =
@@ -617,7 +617,7 @@ TabContents* DuplicateTabAt(Browser* browser, int index) {
       SessionServiceFactory::GetForProfileIfExisting(browser->profile());
   if (session_service)
     session_service->TabRestored(contents_dupe->web_contents(), pinned);
-  return contents_dupe;
+  return contents_dupe->web_contents();
 }
 
 bool CanDuplicateTabAt(Browser* browser, int index) {
@@ -974,13 +974,12 @@ bool IsDebuggerAttachedToCurrentTab(Browser* browser) {
       content::DevToolsAgentHostRegistry::IsDebuggerAttached(contents) : false;
 }
 
-void ViewSource(Browser* browser, TabContents* contents) {
+void ViewSource(Browser* browser, WebContents* contents) {
   DCHECK(contents);
 
   // Use the last committed entry, since the pending entry hasn't loaded yet and
   // won't be copied into the cloned tab.
-  NavigationEntry* entry =
-    contents->web_contents()->GetController().GetLastCommittedEntry();
+  NavigationEntry* entry = contents->GetController().GetLastCommittedEntry();
   if (!entry)
     return;
 
@@ -988,7 +987,7 @@ void ViewSource(Browser* browser, TabContents* contents) {
 }
 
 void ViewSource(Browser* browser,
-                TabContents* contents,
+                WebContents* contents,
                 const GURL& url,
                 const std::string& content_state) {
   content::RecordAction(UserMetricsAction("ViewSource"));
@@ -997,7 +996,7 @@ void ViewSource(Browser* browser,
   // Note that Clone does not copy the pending or transient entries, so the
   // active entry in view_source_contents will be the last committed entry.
   TabContents* view_source_contents =
-      BrowserCommandsTabContentsCreator::CloneTabContents(contents);
+      BrowserCommandsTabContentsCreator::CreateTabContents(contents->Clone());
   view_source_contents->web_contents()->GetController().PruneAllButActive();
   NavigationEntry* active_entry =
       view_source_contents->web_contents()->GetController().GetActiveEntry();
@@ -1019,7 +1018,7 @@ void ViewSource(Browser* browser,
   if (browser->CanSupportWindowFeature(Browser::FEATURE_TABSTRIP)) {
     // If this is a tabbed browser, just create a duplicate tab inside the same
     // window next to the tab being duplicated.
-    int index = browser->tab_strip_model()->GetIndexOfTabContents(contents);
+    int index = browser->tab_strip_model()->GetIndexOfWebContents(contents);
     int add_types = TabStripModel::ADD_ACTIVE |
         TabStripModel::ADD_INHERIT_GROUP;
     browser->tab_strip_model()->InsertWebContentsAt(
@@ -1053,11 +1052,12 @@ void ViewSource(Browser* browser,
 }
 
 void ViewSelectedSource(Browser* browser) {
-  ViewSource(browser, browser->tab_strip_model()->GetActiveTabContents());
+  ViewSource(browser, browser->tab_strip_model()->GetActiveWebContents());
 }
 
 bool CanViewSource(const Browser* browser) {
-  return GetActiveWebContents(browser)->GetController().CanViewSource();
+  return browser->tab_strip_model()->GetActiveWebContents()->
+      GetController().CanViewSource();
 }
 
 void CreateApplicationShortcuts(Browser* browser) {
diff --git a/chrome/browser/ui/browser_commands.h b/chrome/browser/ui/browser_commands.h
index c7dc84a..6776240c 100644
--- a/chrome/browser/ui/browser_commands.h
+++ b/chrome/browser/ui/browser_commands.h
@@ -16,7 +16,6 @@ class Browser;
 class CommandObserver;
 class GURL;
 class Profile;
-class TabContents;
 
 namespace content {
 class WebContents;
@@ -87,7 +86,7 @@ void SelectNumberedTab(Browser* browser, int index);
 void SelectLastTab(Browser* browser);
 void DuplicateTab(Browser* browser);
 bool CanDuplicateTab(const Browser* browser);
-TabContents* DuplicateTabAt(Browser* browser, int index);
+content::WebContents* DuplicateTabAt(Browser* browser, int index);
 bool CanDuplicateTabAt(Browser* browser, int index);
 void ConvertPopupToTabbedBrowser(Browser* browser);
 void Exit();
@@ -144,12 +143,12 @@ void ToggleFullscreenMode(Browser* browser);
 void ClearCache(Browser* browser);
 bool IsDebuggerAttachedToCurrentTab(Browser* browser);
 
-// Opens view-source tab for given tab contents.
-void ViewSource(Browser* browser, TabContents* tab);
+// Opens a view-source tab for a given web contents.
+void ViewSource(Browser* browser, content::WebContents* tab);
 
-// Opens view-source tab for any frame within given tab contents.
+// Opens a view-source tab for any frame within a given web contents.
 void ViewSource(Browser* browser,
-                TabContents* tab,
+                content::WebContents* tab,
                 const GURL& url,
                 const std::string& content_state);