diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-27 07:39:20 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-27 07:39:20 +0000 |
| commit | a81343d237b07d43864118250ac37fe48d63c508 (patch) | |
| tree | 2d11ad88907d157fffdbb615b665ca29e7194aca /chrome/browser/infobars | |
| parent | bcfea60e01be1e47b07bd3038d765ad409aacf1d (diff) | |
| download | chromium_src-a81343d237b07d43864118250ac37fe48d63c508.zip chromium_src-a81343d237b07d43864118250ac37fe48d63c508.tar.gz chromium_src-a81343d237b07d43864118250ac37fe48d63c508.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/infobars')
| -rw-r--r-- | chrome/browser/infobars/infobar_tab_helper.cc | 10 | ||||
| -rw-r--r-- | chrome/browser/infobars/infobar_tab_helper.h | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/infobars/infobar_tab_helper.cc b/chrome/browser/infobars/infobar_tab_helper.cc index ec9cad6..4dede23 100644 --- a/chrome/browser/infobars/infobar_tab_helper.cc +++ b/chrome/browser/infobars/infobar_tab_helper.cc @@ -10,12 +10,14 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/render_messages.h" #include "content/public/browser/notification_service.h" -#include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/web_contents.h" -InfoBarTabHelper::InfoBarTabHelper(TabContents* tab_contents) - : content::WebContentsObserver(tab_contents), +using content::WebContents; + +InfoBarTabHelper::InfoBarTabHelper(WebContents* web_contents) + : content::WebContentsObserver(web_contents), infobars_enabled_(true) { - DCHECK(tab_contents); + DCHECK(web_contents); } InfoBarTabHelper::~InfoBarTabHelper() { diff --git a/chrome/browser/infobars/infobar_tab_helper.h b/chrome/browser/infobars/infobar_tab_helper.h index f4e78f1..877e6f8 100644 --- a/chrome/browser/infobars/infobar_tab_helper.h +++ b/chrome/browser/infobars/infobar_tab_helper.h @@ -16,7 +16,7 @@ class InfoBarDelegate; class InfoBarTabHelper : public content::WebContentsObserver, public content::NotificationObserver { public: - explicit InfoBarTabHelper(TabContents* tab_contents); + explicit InfoBarTabHelper(content::WebContents* web_contents); virtual ~InfoBarTabHelper(); // Adds an InfoBar for the specified |delegate|. |