| Index: chrome/browser/geolocation/geolocation_infobar_delegate.cc
|
| diff --git a/chrome/browser/geolocation/geolocation_infobar_delegate.cc b/chrome/browser/geolocation/geolocation_infobar_delegate.cc
|
| index d910433285e70098baaa6b28145ab1ca547effbc..95d6b25b19ae399896781459529610728d68dd63 100644
|
| --- a/chrome/browser/geolocation/geolocation_infobar_delegate.cc
|
| +++ b/chrome/browser/geolocation/geolocation_infobar_delegate.cc
|
| @@ -113,9 +113,11 @@ bool GeolocationInfoBarDelegate::Accept() {
|
|
|
| void GeolocationInfoBarDelegate::SetPermission(bool update_content_setting,
|
| bool allowed) {
|
| + content::WebContents* web_contents =
|
| + InfoBarService::WebContentsFromInfoBar(infobar());
|
| controller_->OnPermissionSet(
|
| id_, requesting_frame_,
|
| - web_contents()->GetLastCommittedURL().GetOrigin(),
|
| + web_contents->GetLastCommittedURL().GetOrigin(),
|
| update_content_setting, allowed);
|
| }
|
|
|
| @@ -175,10 +177,11 @@ bool GeolocationInfoBarDelegate::LinkClicked(
|
| "https://www.google.com/support/chrome/bin/answer.py?answer=142065";
|
| #endif
|
|
|
| - web_contents()->OpenURL(content::OpenURLParams(
|
| - google_util::AppendGoogleLocaleParam(GURL(kGeolocationLearnMoreUrl)),
|
| - content::Referrer(),
|
| - (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
|
| - content::PAGE_TRANSITION_LINK, false));
|
| + InfoBarService::WebContentsFromInfoBar(infobar())->OpenURL(
|
| + content::OpenURLParams(
|
| + google_util::AppendGoogleLocaleParam(GURL(kGeolocationLearnMoreUrl)),
|
| + content::Referrer(),
|
| + (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
|
| + content::PAGE_TRANSITION_LINK, false));
|
| return false; // Do not dismiss the info bar.
|
| }
|
|
|