diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-08 04:20:40 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-08 04:20:40 +0000 |
commit | ec8f51164d477d8d83726fe61c68977d17b03149 (patch) | |
tree | de1ea01984caab5a5841c8a7c1593805157ce60d /chrome/browser/geolocation/geolocation_permission_context.cc | |
parent | ef47ded033e48098e83bb94e63b6e44ca6b511b4 (diff) | |
download | chromium_src-ec8f51164d477d8d83726fe61c68977d17b03149.zip chromium_src-ec8f51164d477d8d83726fe61c68977d17b03149.tar.gz chromium_src-ec8f51164d477d8d83726fe61c68977d17b03149.tar.bz2 |
Cleanup:
* Change int to size_t in a few APIs.
* Rename infobar_delegate_count() to infobar_count() in preparation for TabContents owning InfoBars rather than InfoBarDelegates.
* Move some code from PluginInstallerInfoBarDelegate to PluginObserver since it's more related to who's instantiating the infobar(delegate)s.
* Unify InfoBarDelegate behavior by making no delegates auto-add themselves to tabs (callers now all do this explicitly).
* Eliminate unused member TabContentsSSLHelper::SSLAddCertData::handler_.
* De-inline a couple classes.
* Make more functions private.
* Add some consts.
* Change DCHECK() to DCHECK_EQ() where possible.
* Rename the delegates in plugin_observer.cc to have "Delegate" in the names.
* Remove unnecessary qualifiers.
* Simplify.
* Misc. style issues, naming issues, etc.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6250172
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74086 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation/geolocation_permission_context.cc')
-rw-r--r-- | chrome/browser/geolocation/geolocation_permission_context.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/geolocation/geolocation_permission_context.cc b/chrome/browser/geolocation/geolocation_permission_context.cc index 5d52abb..e8f7e4c 100644 --- a/chrome/browser/geolocation/geolocation_permission_context.cc +++ b/chrome/browser/geolocation/geolocation_permission_context.cc @@ -104,18 +104,11 @@ class GeolocationInfoBarQueueController : NotificationObserver { PendingInfoBarRequests pending_infobar_requests_; }; -namespace { - -const char kGeolocationLearnMoreUrl[] = -#if defined(OS_CHROMEOS) - "http://www.google.com/support/chromeos/bin/answer.py?answer=142065"; -#else - "http://www.google.com/support/chrome/bin/answer.py?answer=142065"; -#endif - // GeolocationConfirmInfoBarDelegate ------------------------------------------ +namespace { + class GeolocationConfirmInfoBarDelegate : public ConfirmInfoBarDelegate { public: GeolocationConfirmInfoBarDelegate( @@ -218,6 +211,13 @@ string16 GeolocationConfirmInfoBarDelegate::GetLinkText() { bool GeolocationConfirmInfoBarDelegate::LinkClicked( WindowOpenDisposition disposition) { + const char kGeolocationLearnMoreUrl[] = +#if defined(OS_CHROMEOS) + "http://www.google.com/support/chromeos/bin/answer.py?answer=142065"; +#else + "http://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)), |