diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-25 21:37:09 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-25 21:37:09 +0000 |
| commit | ea049a01f82647dc12e4001c8be03e4124faaff3 (patch) | |
| tree | 0bb59450d13be2f37e404cfd2374ea27fba7461f /chrome/browser/infobars | |
| parent | 5ca3ddf71cb1db27e206c4d048770ad21e5688c9 (diff) | |
| download | chromium_src-ea049a01f82647dc12e4001c8be03e4124faaff3.zip chromium_src-ea049a01f82647dc12e4001c8be03e4124faaff3.tar.gz chromium_src-ea049a01f82647dc12e4001c8be03e4124faaff3.tar.bz2 | |
Convert a bunch of WebContentsObservers to use web_contents() instead of tab_contents(), as well as all the dependent code.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/8982008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/infobars')
| -rw-r--r-- | chrome/browser/infobars/infobar_delegate.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/infobars/infobar_tab_helper.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/infobars/infobar_tab_helper.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/infobars/infobar_delegate.cc b/chrome/browser/infobars/infobar_delegate.cc index 754577d..9622d35 100644 --- a/chrome/browser/infobars/infobar_delegate.cc +++ b/chrome/browser/infobars/infobar_delegate.cc @@ -8,8 +8,8 @@ #include "build/build_config.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "content/browser/tab_contents/navigation_entry.h" -#include "content/browser/tab_contents/tab_contents.h" #include "content/public/browser/navigation_details.h" +#include "content/public/browser/web_contents.h" // InfoBarDelegate ------------------------------------------------------------ @@ -84,7 +84,7 @@ InfoBarDelegate::InfoBarDelegate(InfoBarTabHelper* infobar_helper) void InfoBarDelegate::StoreActiveEntryUniqueID( InfoBarTabHelper* infobar_helper) { NavigationEntry* active_entry = - infobar_helper->tab_contents()->GetController().GetActiveEntry(); + infobar_helper->web_contents()->GetController().GetActiveEntry(); contents_unique_id_ = active_entry ? active_entry->GetUniqueID() : 0; } diff --git a/chrome/browser/infobars/infobar_tab_helper.cc b/chrome/browser/infobars/infobar_tab_helper.cc index 12fa355..ec9cad6 100644 --- a/chrome/browser/infobars/infobar_tab_helper.cc +++ b/chrome/browser/infobars/infobar_tab_helper.cc @@ -56,7 +56,7 @@ void InfoBarTabHelper::AddInfoBar(InfoBarDelegate* delegate) { registrar_.Add( this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::Source<NavigationController>( - &tab_contents()->GetController())); + &web_contents()->GetController())); } } @@ -122,7 +122,7 @@ void InfoBarTabHelper::RemoveInfoBarInternal(InfoBarDelegate* delegate, registrar_.Remove( this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::Source<NavigationController>( - &tab_contents()->GetController())); + &web_contents()->GetController())); } } @@ -179,7 +179,7 @@ void InfoBarTabHelper::Observe(int type, const content::NotificationDetails& details) { switch (type) { case content::NOTIFICATION_NAV_ENTRY_COMMITTED: { - DCHECK(&tab_contents()->GetController() == + DCHECK(&web_contents()->GetController() == content::Source<NavigationController>(source).ptr()); content::LoadCommittedDetails& committed_details = diff --git a/chrome/browser/infobars/infobar_tab_helper.h b/chrome/browser/infobars/infobar_tab_helper.h index 133a341..f4e78f1 100644 --- a/chrome/browser/infobars/infobar_tab_helper.h +++ b/chrome/browser/infobars/infobar_tab_helper.h @@ -58,8 +58,8 @@ class InfoBarTabHelper : public content::WebContentsObserver, const content::NotificationDetails& details) OVERRIDE; // Helper functions for infobars: - TabContents* tab_contents() { - return content::WebContentsObserver::tab_contents(); + content::WebContents* web_contents() { + return content::WebContentsObserver::web_contents(); } private: |