Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ...

chrome/browser/ui/panels/panel.cc

 // Copyright (c) 2011 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/panels/panel.h"
 
 #include "base/logging.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 89 matching lines @@
       content::NotificationService::NoDetails());
 }
 
 void Panel::SetAutoResizable(bool resizable) {
   if (auto_resizable_ == resizable)
     return;
 
   auto_resizable_ = resizable;
   if (auto_resizable_) {
     browser()->tabstrip_model()->AddObserver(this);
-    TabContents* tab_contents = browser()->GetSelectedTabContents();
-    if (tab_contents)
-      EnableTabContentsAutoResize(tab_contents);
+    WebContents* web_contents = browser()->GetSelectedWebContents();
+    if (web_contents)
+      EnableWebContentsAutoResize(web_contents);
   } else {
     browser()->tabstrip_model()->RemoveObserver(this);
     registrar_.RemoveAll();
   }
 }
 
 void Panel::SetSizeRange(const gfx::Size& min_size, const gfx::Size& max_size) {
   if (min_size == min_size_ && max_size == max_size_)
     return;
 
   DCHECK(min_size.width() <= max_size.width());
   DCHECK(min_size.height() <= max_size.height());
   min_size_ = min_size;
   max_size_ = max_size;
 
-  ConfigureAutoResize(browser()->GetSelectedTabContents());
+  ConfigureAutoResize(browser()->GetSelectedWebContents());
 }
 
 void Panel::SetAppIconVisibility(bool visible) {
   if (app_icon_visible_ == visible)
     return;
   app_icon_visible_ = visible;
   native_panel_->SetPanelAppIconVisibility(visible);
 }
 
 void Panel::SetExpansionState(ExpansionState new_state) {
@@ skipping 452 matching lines @@
 void Panel::ShowAvatarBubbleFromAvatarButton() {
   // Panels will never show an avatar button so this should never be called.
   NOTREACHED();
 }
 
 void Panel::TabInsertedAt(TabContentsWrapper* contents,
                           int index,
                           bool foreground) {
   if (auto_resizable_) {
     DCHECK_EQ(0, index);
-    EnableTabContentsAutoResize(contents->tab_contents());
+    EnableWebContentsAutoResize(contents->web_contents());
   }
 }
 
-void Panel::EnableTabContentsAutoResize(TabContents* tab_contents) {
-  DCHECK(tab_contents);
-  ConfigureAutoResize(tab_contents);
+void Panel::EnableWebContentsAutoResize(WebContents* web_contents) {
+  DCHECK(web_contents);
+  ConfigureAutoResize(web_contents);
 
   // We also need to know when the render view host changes in order
   // to turn on auto-resize notifications in the new render view host.
   registrar_.RemoveAll();  // Stop notifications for previous contents, if any.
   registrar_.Add(
       this,
-      content::NOTIFICATION_TAB_CONTENTS_SWAPPED,
-      content::Source<TabContents>(tab_contents));
+      content::NOTIFICATION_WEB_CONTENTS_SWAPPED,
+      content::Source<WebContents>(web_contents));
 }
 
 void Panel::Observe(int type,
                     const content::NotificationSource& source,
                     const content::NotificationDetails& details) {
-  DCHECK_EQ(type, content::NOTIFICATION_TAB_CONTENTS_SWAPPED);
-  ConfigureAutoResize(content::Source<TabContents>(source).ptr());
+  DCHECK_EQ(type, content::NOTIFICATION_WEB_CONTENTS_SWAPPED);
+  ConfigureAutoResize(content::Source<WebContents>(source).ptr());
 }
 
-void Panel::ConfigureAutoResize(TabContents* tab_contents) {
-  if (!auto_resizable_ || !tab_contents)
+void Panel::ConfigureAutoResize(WebContents* web_contents) {
+  if (!auto_resizable_ || !web_contents)
     return;
 
   // NULL might be returned if the tab has not been added.
-  RenderViewHost* render_view_host = tab_contents->GetRenderViewHost();
+  RenderViewHost* render_view_host = web_contents->GetRenderViewHost();
   if (!render_view_host)
     return;
 
   render_view_host->EnableAutoResize(
       min_size_,
       native_panel_->ContentSizeFromWindowSize(max_size_));
 }
 
 void Panel::OnWindowSizeAvailable() {
-  ConfigureAutoResize(browser()->GetSelectedTabContents());
+  ConfigureAutoResize(browser()->GetSelectedWebContents());
 }
 
 void Panel::DestroyBrowser() {
   native_panel_->DestroyPanelBrowser();
 }