diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 05:09:04 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 05:09:04 +0000 |
| commit | 69cda6547de3c2bc25e6476607e7550ba548cac9 (patch) | |
| tree | e54f39838f04e0e61921cd7457711019be8b545f /chrome/browser/infobars | |
| parent | c691a593ac199d774a43f239342cd85c80ca1a2a (diff) | |
| download | chromium_src-69cda6547de3c2bc25e6476607e7550ba548cac9.zip chromium_src-69cda6547de3c2bc25e6476607e7550ba548cac9.tar.gz chromium_src-69cda6547de3c2bc25e6476607e7550ba548cac9.tar.bz2 | |
Rename TabContents::controller() to GetController and put it into the WebContents namespace.
BUG=98716
TBR=dpranke
Review URL: http://codereview.chromium.org/8956050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/infobars')
| -rw-r--r-- | chrome/browser/infobars/infobar_delegate.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/infobars/infobar_tab_helper.cc | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/infobars/infobar_delegate.cc b/chrome/browser/infobars/infobar_delegate.cc index 777e054..614400f 100644 --- a/chrome/browser/infobars/infobar_delegate.cc +++ b/chrome/browser/infobars/infobar_delegate.cc @@ -84,7 +84,7 @@ InfoBarDelegate::InfoBarDelegate(InfoBarTabHelper* infobar_helper) void InfoBarDelegate::StoreActiveEntryUniqueID( InfoBarTabHelper* infobar_helper) { NavigationEntry* active_entry = - infobar_helper->tab_contents()->controller().GetActiveEntry(); + infobar_helper->tab_contents()->GetController().GetActiveEntry(); contents_unique_id_ = active_entry ? active_entry->unique_id() : 0; } diff --git a/chrome/browser/infobars/infobar_tab_helper.cc b/chrome/browser/infobars/infobar_tab_helper.cc index 000bfb4..d3baf4a 100644 --- a/chrome/browser/infobars/infobar_tab_helper.cc +++ b/chrome/browser/infobars/infobar_tab_helper.cc @@ -55,7 +55,8 @@ void InfoBarTabHelper::AddInfoBar(InfoBarDelegate* delegate) { if (infobars_.size() == 1) { registrar_.Add( this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, - content::Source<NavigationController>(&tab_contents()->controller())); + content::Source<NavigationController>( + &tab_contents()->GetController())); } } @@ -118,8 +119,10 @@ void InfoBarTabHelper::RemoveInfoBarInternal(InfoBarDelegate* delegate, infobars_.erase(infobars_.begin() + i); // Remove ourselves as an observer if we are tracking no more InfoBars. if (infobars_.empty()) { - registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, - content::Source<NavigationController>(&tab_contents()->controller())); + registrar_.Remove( + this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, + content::Source<NavigationController>( + &tab_contents()->GetController())); } } @@ -176,7 +179,7 @@ void InfoBarTabHelper::Observe(int type, const content::NotificationDetails& details) { switch (type) { case content::NOTIFICATION_NAV_ENTRY_COMMITTED: { - DCHECK(&tab_contents()->controller() == + DCHECK(&tab_contents()->GetController() == content::Source<NavigationController>(source).ptr()); content::LoadCommittedDetails& committed_details = |