summaryrefslogtreecommitdiffstats
path: root/chrome/browser/geolocation
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-02 01:33:53 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-02 01:33:53 +0000
commit8f3a836e23ad632b917ed187d5a74c6b30938f3f (patch)
treeff349aaf3d449432810972f2904b314979b8ec5f /chrome/browser/geolocation
parentc0ee6fc774d579c9717e9a3f3cd94be9ea132239 (diff)
downloadchromium_src-8f3a836e23ad632b917ed187d5a74c6b30938f3f.zip
chromium_src-8f3a836e23ad632b917ed187d5a74c6b30938f3f.tar.gz
chromium_src-8f3a836e23ad632b917ed187d5a74c6b30938f3f.tar.bz2
Unify infobars' link-opening behavior to respect user-requested dispositions and append the Google locale param (since all these links are opening Google pages).
This also fixes an incorrect "&amp;" (should be "&") that I assume is a holdover from the string in question formerly being in generated_resources.grd. Randomly, this also removes some unnecessary .c_str() calls in logging_chrome.cc. BUG=none TEST=Middle-clicking "Learn more" on any applicable infobar should open the link in a new background tab. Review URL: http://codereview.chromium.org/7545021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation')
-rw-r--r--chrome/browser/geolocation/chrome_geolocation_permission_context.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
index 4d90689..91d6a35 100644
--- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
@@ -214,10 +214,10 @@ bool GeolocationConfirmInfoBarDelegate::LinkClicked(
"https://www.google.com/support/chrome/bin/answer.py?answer=142065";
#endif
- // Ignore the click disposition and always open in a new top level tab.
tab_contents_->OpenURL(
google_util::AppendGoogleLocaleParam(GURL(kGeolocationLearnMoreUrl)),
- GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
+ GURL(), (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
+ PageTransition::LINK);
return false; // Do not dismiss the info bar.
}