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

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: Fix ups Created 7 years, 4 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..4b7448a88d5ed38d56b9a88e8faf1934bf692951 100644
--- a/chrome/browser/geolocation/geolocation_infobar_delegate_android.h
+++ b/chrome/browser/geolocation/geolocation_infobar_delegate_android.h
@@ -10,7 +10,8 @@
class GoogleLocationSettingsHelper;
-class GeolocationInfoBarDelegateAndroid : public GeolocationInfoBarDelegate {
+class GeolocationInfoBarDelegateAndroid : public GeolocationInfoBarDelegate,
+ public base::RefCountedThreadSafe<GeolocationInfoBarDelegateAndroid> {
joth 2013/08/20 23:07:21 you can't just mix in ref-counting. The root base
acleung1 2013/08/23 23:13:09 removed.
public:
GeolocationInfoBarDelegateAndroid(
InfoBarService* infobar_service,
@@ -20,15 +21,20 @@ class GeolocationInfoBarDelegateAndroid : public GeolocationInfoBarDelegate {
int contents_unique_id,
const std::string& display_languages);
- private:
+ virtual void Initialize(InfoBarService* infobar_service) OVERRIDE;
virtual ~GeolocationInfoBarDelegateAndroid();
joth 2013/08/20 23:07:21 (likewise you won't want a public d'tor here if yo
acleung1 2013/08/23 23:13:09 removed instead.
+ private:
// ConfirmInfoBarDelegate:
virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
virtual bool Accept() OVERRIDE;
+ void CheckLocationSettings(InfoBarService* infobar_service);
+
scoped_ptr<GoogleLocationSettingsHelper> google_location_settings_helper_;
+ bool is_allow_label;
joth 2013/08/20 23:07:21 trailing _
acleung1 2013/08/23 23:13:09 Done.
+
DISALLOW_COPY_AND_ASSIGN(GeolocationInfoBarDelegateAndroid);
};

Powered by Google App Engine
This is Rietveld 408576698