From fbc5e5f97c0bd570130471c85c207aee528eef4c Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Mon, 2 Jan 2012 06:08:32 +0000 Subject: Convert chrome users of NavigationController::tab_contents() to use GetWebContents() instead. BUG=98716 TBR=joi Review URL: http://codereview.chromium.org/8986009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116086 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/alternate_nav_url_fetcher.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/browser/alternate_nav_url_fetcher.cc') diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc index 04a2c4e..3676a4d 100644 --- a/chrome/browser/alternate_nav_url_fetcher.cc +++ b/chrome/browser/alternate_nav_url_fetcher.cc @@ -12,9 +12,9 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" #include "content/browser/tab_contents/navigation_controller.h" -#include "content/browser/tab_contents/tab_contents.h" #include "content/public/browser/notification_service.h" #include "content/public/common/url_fetcher.h" +#include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" #include "grit/theme_resources_standard.h" #include "net/base/registry_controlled_domain.h" @@ -137,7 +137,7 @@ void AlternateNavURLFetcher::Observe( // See above. NavigationController* controller = &content::Source(source)-> - tab_contents()->GetController(); + web_contents()->GetController(); if (controller_ == controller) { delete this; } else if (!controller_) { @@ -225,7 +225,7 @@ void AlternateNavURLFetcher::ShowInfobarIfPossible() { InfoBarTabHelper* infobar_helper = TabContentsWrapper::GetCurrentWrapperForContents( - controller_->tab_contents())->infobar_tab_helper(); + controller_->GetWebContents())->infobar_tab_helper(); infobar_helper->AddInfoBar( new AlternateNavInfoBarDelegate(infobar_helper, alternate_nav_url_)); delete this; -- cgit v1.1