Convert SpeechInputBubble and BalloonHost to use WebContents instead of TabContents, as well as all the dependent code.

BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/9016038

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

2 files changed, 5 insertions, 5 deletions

diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc
index bd5a077..e1e50a3 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.cc
+++ b/chrome/browser/content_settings/tab_specific_content_settings.cc
@@ -24,9 +24,10 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/tab_contents/tab_contents.h"
+#include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "webkit/fileapi/file_system_types.h"
 
@@ -49,7 +50,7 @@ bool TabSpecificContentSettings::LocalSharedObjectsContainer::empty() const {
       session_storages_->empty();
 }
 
-TabSpecificContentSettings::TabSpecificContentSettings(TabContents* tab)
+TabSpecificContentSettings::TabSpecificContentSettings(WebContents* tab)
     : content::WebContentsObserver(tab),
       profile_(Profile::FromBrowserContext(tab->GetBrowserContext())),
       allowed_local_shared_objects_(profile_),
@@ -81,7 +82,7 @@ TabSpecificContentSettings* TabSpecificContentSettings::Get(
   // latter will miss provisional RenderViewHosts.
   for (TabSpecificList::iterator i = g_tab_specific.Get().begin();
        i != g_tab_specific.Get().end(); ++i) {
-    if (view->delegate()->GetAsTabContents() == (*i)->web_contents())
+    if (view->delegate()->GetAsWebContents() == (*i)->web_contents())
       return (*i);
   }
 
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.h b/chrome/browser/content_settings/tab_specific_content_settings.h
index 507adbb..55ca203 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.h
+++ b/chrome/browser/content_settings/tab_specific_content_settings.h
@@ -26,7 +26,6 @@ class CannedBrowsingDataFileSystemHelper;
 class CannedBrowsingDataIndexedDBHelper;
 class CannedBrowsingDataLocalStorageHelper;
 class CookiesTreeModel;
-class TabContents;
 class Profile;
 
 namespace net {
@@ -37,7 +36,7 @@ class CookieOptions;
 class TabSpecificContentSettings : public content::WebContentsObserver,
                                    public content::NotificationObserver {
  public:
-  explicit TabSpecificContentSettings(TabContents* tab);
+  explicit TabSpecificContentSettings(content::WebContents* tab);
 
   virtual ~TabSpecificContentSettings();