Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1772)

Unified Diff: chrome/browser/geolocation/geolocation_infobar_delegate_android.h

Issue 23345004: Fix Android strict-mode violation in GeoLocation info bar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/geolocation/geolocation_infobar_delegate_android.h
diff --git a/chrome/browser/geolocation/geolocation_infobar_delegate_android.h b/chrome/browser/geolocation/geolocation_infobar_delegate_android.h
index e247f7fe1bb51b49854d63d50ffa0be57511786c..9defa39bab90459d725c713f05b6680241856e4e 100644
--- a/chrome/browser/geolocation/geolocation_infobar_delegate_android.h
+++ b/chrome/browser/geolocation/geolocation_infobar_delegate_android.h
@@ -20,6 +20,9 @@ class GeolocationInfoBarDelegateAndroid : public GeolocationInfoBarDelegate {
int contents_unique_id,
const std::string& display_languages);
+ protected:
+ virtual void Show(InfoBarService* infobar_service) OVERRIDE;
+
private:
virtual ~GeolocationInfoBarDelegateAndroid();
@@ -27,8 +30,14 @@ class GeolocationInfoBarDelegateAndroid : public GeolocationInfoBarDelegate {
virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
virtual bool Accept() OVERRIDE;
+ void CallParentShow(InfoBarService* infobar_service);
+
+ void CheckLocationSettings(InfoBarService* infobar_service);
+
scoped_ptr<GoogleLocationSettingsHelper> google_location_settings_helper_;
+ bool is_allow_label_;
+
DISALLOW_COPY_AND_ASSIGN(GeolocationInfoBarDelegateAndroid);
};

Powered by Google App Engine
This is Rietveld 408576698