summaryrefslogtreecommitdiffstats
path: root/chrome/browser/geolocation
diff options
context:
space:
mode:
authorestade <estade@chromium.org>2015-10-26 12:16:56 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-26 19:17:51 +0000
commitb5c6c41ab0dc285e7300a7bf8b6abdbf77b2feb5 (patch)
tree13338a67834adcbda04b74232ac9035b90ff3927 /chrome/browser/geolocation
parentbe81738d16b0e1dcb51f2f92fc10ac6d216d42a1 (diff)
downloadchromium_src-b5c6c41ab0dc285e7300a7bf8b6abdbf77b2feb5.zip
chromium_src-b5c6c41ab0dc285e7300a7bf8b6abdbf77b2feb5.tar.gz
chromium_src-b5c6c41ab0dc285e7300a7bf8b6abdbf77b2feb5.tar.bz2
Fix name of GeolocationInfoBarDelegateAndroid
BUG=none TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1422053003 Cr-Commit-Position: refs/heads/master@{#356093}
Diffstat (limited to 'chrome/browser/geolocation')
-rw-r--r--chrome/browser/geolocation/geolocation_infobar_delegate_android.cc26
-rw-r--r--chrome/browser/geolocation/geolocation_infobar_delegate_android.h16
2 files changed, 18 insertions, 24 deletions
diff --git a/chrome/browser/geolocation/geolocation_infobar_delegate_android.cc b/chrome/browser/geolocation/geolocation_infobar_delegate_android.cc
index 0969172..3cffcc4 100644
--- a/chrome/browser/geolocation/geolocation_infobar_delegate_android.cc
+++ b/chrome/browser/geolocation/geolocation_infobar_delegate_android.cc
@@ -13,37 +13,33 @@
#include "ui/base/l10n/l10n_util.h"
// static
-infobars::InfoBar* GeolocationInfoBarDelegateAndroidAndroid::Create(
+infobars::InfoBar* GeolocationInfoBarDelegateAndroid::Create(
InfoBarService* infobar_service,
const GURL& requesting_frame,
const std::string& display_languages,
const PermissionSetCallback& callback) {
- return infobar_service->AddInfoBar(
- infobar_service->CreateConfirmInfoBar(scoped_ptr<ConfirmInfoBarDelegate>(
- new GeolocationInfoBarDelegateAndroidAndroid(
- requesting_frame, display_languages, callback))));
+ return infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar(
+ scoped_ptr<ConfirmInfoBarDelegate>(new GeolocationInfoBarDelegateAndroid(
+ requesting_frame, display_languages, callback))));
}
-GeolocationInfoBarDelegateAndroidAndroid::
- GeolocationInfoBarDelegateAndroidAndroid(
- const GURL& requesting_frame,
- const std::string& display_languages,
- const PermissionSetCallback& callback)
+GeolocationInfoBarDelegateAndroid::GeolocationInfoBarDelegateAndroid(
+ const GURL& requesting_frame,
+ const std::string& display_languages,
+ const PermissionSetCallback& callback)
: PermissionInfobarDelegate(requesting_frame,
CONTENT_SETTINGS_TYPE_GEOLOCATION,
callback),
requesting_frame_(requesting_frame),
display_languages_(display_languages) {}
-GeolocationInfoBarDelegateAndroidAndroid::
- ~GeolocationInfoBarDelegateAndroidAndroid() {}
+GeolocationInfoBarDelegateAndroid::~GeolocationInfoBarDelegateAndroid() {}
-int GeolocationInfoBarDelegateAndroidAndroid::GetIconId() const {
+int GeolocationInfoBarDelegateAndroid::GetIconId() const {
return IDR_ANDROID_INFOBAR_GEOLOCATION;
}
-base::string16 GeolocationInfoBarDelegateAndroidAndroid::GetMessageText()
- const {
+base::string16 GeolocationInfoBarDelegateAndroid::GetMessageText() const {
return l10n_util::GetStringFUTF16(IDS_GEOLOCATION_INFOBAR_QUESTION,
url_formatter::FormatUrlForSecurityDisplay(
requesting_frame_, display_languages_));
diff --git a/chrome/browser/geolocation/geolocation_infobar_delegate_android.h b/chrome/browser/geolocation/geolocation_infobar_delegate_android.h
index 87aab1b..ecb28ea 100644
--- a/chrome/browser/geolocation/geolocation_infobar_delegate_android.h
+++ b/chrome/browser/geolocation/geolocation_infobar_delegate_android.h
@@ -10,11 +10,10 @@
#include "base/macros.h"
#include "chrome/browser/permissions/permission_infobar_delegate.h"
-// GeolocationInfoBarDelegateAndroidAndroids are created by the
+// GeolocationInfoBarDelegateAndroids are created by the
// PermissionQueueController to control the display
// and handling of geolocation permission infobars to the user.
-class GeolocationInfoBarDelegateAndroidAndroid
- : public PermissionInfobarDelegate {
+class GeolocationInfoBarDelegateAndroid : public PermissionInfobarDelegate {
public:
// Creates a geolocation infobar and delegate and adds the infobar to
// |infobar_service|. Returns the infobar if it was successfully added.
@@ -24,11 +23,10 @@ class GeolocationInfoBarDelegateAndroidAndroid
const PermissionSetCallback& callback);
private:
- GeolocationInfoBarDelegateAndroidAndroid(
- const GURL& requesting_frame,
- const std::string& display_languages,
- const PermissionSetCallback& callback);
- ~GeolocationInfoBarDelegateAndroidAndroid() override;
+ GeolocationInfoBarDelegateAndroid(const GURL& requesting_frame,
+ const std::string& display_languages,
+ const PermissionSetCallback& callback);
+ ~GeolocationInfoBarDelegateAndroid() override;
// PermissionInfoBarDelegate:
int GetIconId() const override;
@@ -37,7 +35,7 @@ class GeolocationInfoBarDelegateAndroidAndroid
GURL requesting_frame_;
std::string display_languages_;
- DISALLOW_COPY_AND_ASSIGN(GeolocationInfoBarDelegateAndroidAndroid);
+ DISALLOW_COPY_AND_ASSIGN(GeolocationInfoBarDelegateAndroid);
};
#endif // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_ANDROID_H_