diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 18:27:46 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 18:27:46 +0000 |
| commit | cca0f1e9ca8aa46a9088028ceb1f08e0a3f792b2 (patch) | |
| tree | 84e486002d42744cea34f59d1b83ab29a0dc5354 /chrome/browser/infobars | |
| parent | 2a3197bb6a8a4c6f3a7affadce28cda638906131 (diff) | |
| download | chromium_src-cca0f1e9ca8aa46a9088028ceb1f08e0a3f792b2.zip chromium_src-cca0f1e9ca8aa46a9088028ceb1f08e0a3f792b2.tar.gz chromium_src-cca0f1e9ca8aa46a9088028ceb1f08e0a3f792b2.tar.bz2 | |
Convert all the notifications which use NavigationController to content::NavigationController. After this is done, we can then make WebContents return a content::NavigationEntry instead of the impl.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/9016047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/infobars')
| -rw-r--r-- | chrome/browser/infobars/infobar_tab_helper.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/infobars/infobar_tab_helper.cc b/chrome/browser/infobars/infobar_tab_helper.cc index 4dede23..fbe633e 100644 --- a/chrome/browser/infobars/infobar_tab_helper.cc +++ b/chrome/browser/infobars/infobar_tab_helper.cc @@ -9,6 +9,7 @@ #include "chrome/browser/tab_contents/insecure_content_infobar_delegate.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/render_messages.h" +#include "content/browser/tab_contents/navigation_controller.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" @@ -57,7 +58,7 @@ void InfoBarTabHelper::AddInfoBar(InfoBarDelegate* delegate) { if (infobars_.size() == 1) { registrar_.Add( this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, - content::Source<NavigationController>( + content::Source<content::NavigationController>( &web_contents()->GetController())); } } @@ -123,7 +124,7 @@ void InfoBarTabHelper::RemoveInfoBarInternal(InfoBarDelegate* delegate, if (infobars_.empty()) { registrar_.Remove( this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, - content::Source<NavigationController>( + content::Source<content::NavigationController>( &web_contents()->GetController())); } } @@ -182,7 +183,7 @@ void InfoBarTabHelper::Observe(int type, switch (type) { case content::NOTIFICATION_NAV_ENTRY_COMMITTED: { DCHECK(&web_contents()->GetController() == - content::Source<NavigationController>(source).ptr()); + content::Source<content::NavigationController>(source).ptr()); content::LoadCommittedDetails& committed_details = *(content::Details<content::LoadCommittedDetails>(details).ptr()); |