Commit 983d3355 authored by miguelg@chromium.org's avatar miguelg@chromium.org

Remove 'Learn More' Link from the geolocation infobar

BUG=401002

Review URL: https://codereview.chromium.org/443873003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287769 0039d316-1c4b-4281-b951-d872f2087c98
parent 7eaf3451
...@@ -45,7 +45,7 @@ enum GeolocationInfoBarDelegateEvent { ...@@ -45,7 +45,7 @@ enum GeolocationInfoBarDelegateEvent {
GEOLOCATION_INFO_BAR_DELEGATE_EVENT_DISMISS = 3, GEOLOCATION_INFO_BAR_DELEGATE_EVENT_DISMISS = 3,
// User clicked on link. // User clicked on link.
GEOLOCATION_INFO_BAR_DELEGATE_EVENT_LINK_CLICK = 4, DEPRECATED_GEOLOCATION_INFO_BAR_DELEGATE_EVENT_LINK_CLICK = 4,
// User ignored the bar. // User ignored the bar.
GEOLOCATION_INFO_BAR_DELEGATE_EVENT_IGNORED = 5, GEOLOCATION_INFO_BAR_DELEGATE_EVENT_IGNORED = 5,
...@@ -163,28 +163,3 @@ bool GeolocationInfoBarDelegate::Cancel() { ...@@ -163,28 +163,3 @@ bool GeolocationInfoBarDelegate::Cancel() {
SetPermission(true, false); SetPermission(true, false);
return true; return true;
} }
base::string16 GeolocationInfoBarDelegate::GetLinkText() const {
return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
}
bool GeolocationInfoBarDelegate::LinkClicked(
WindowOpenDisposition disposition) {
RecordUmaEvent(GEOLOCATION_INFO_BAR_DELEGATE_EVENT_LINK_CLICK);
const char kGeolocationLearnMoreUrl[] =
#if defined(OS_CHROMEOS)
"https://www.google.com/support/chromeos/bin/answer.py?answer=142065";
#elif defined(OS_ANDROID)
"https://support.google.com/chrome/?p=mobile_location";
#else
"https://www.google.com/support/chrome/bin/answer.py?answer=142065";
#endif
InfoBarService::WebContentsFromInfoBar(infobar())->OpenURL(
content::OpenURLParams(
GURL(kGeolocationLearnMoreUrl),
content::Referrer(),
(disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
content::PAGE_TRANSITION_LINK, false));
return false; // Do not dismiss the info bar.
}
...@@ -60,8 +60,6 @@ class GeolocationInfoBarDelegate : public ConfirmInfoBarDelegate { ...@@ -60,8 +60,6 @@ class GeolocationInfoBarDelegate : public ConfirmInfoBarDelegate {
virtual base::string16 GetMessageText() const OVERRIDE; virtual base::string16 GetMessageText() const OVERRIDE;
virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
virtual bool Cancel() OVERRIDE; virtual bool Cancel() OVERRIDE;
virtual base::string16 GetLinkText() const OVERRIDE;
virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
PermissionQueueController* controller_; PermissionQueueController* controller_;
const PermissionRequestID id_; const PermissionRequestID id_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment