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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_ANDROID_H_ 5 #ifndef CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_ANDROID_H_
6 #define CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_ANDROID_H_ 6 #define CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_ANDROID_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chrome/browser/geolocation/geolocation_infobar_delegate.h" 9 #include "chrome/browser/geolocation/geolocation_infobar_delegate.h"
10 10
11 class GoogleLocationSettingsHelper; 11 class GoogleLocationSettingsHelper;
12 12
13 class GeolocationInfoBarDelegateAndroid : public GeolocationInfoBarDelegate { 13 class GeolocationInfoBarDelegateAndroid : public GeolocationInfoBarDelegate,
14 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.
14 public: 15 public:
15 GeolocationInfoBarDelegateAndroid( 16 GeolocationInfoBarDelegateAndroid(
16 InfoBarService* infobar_service, 17 InfoBarService* infobar_service,
17 PermissionQueueController* controller, 18 PermissionQueueController* controller,
18 const PermissionRequestID& id, 19 const PermissionRequestID& id,
19 const GURL& requesting_frame_url, 20 const GURL& requesting_frame_url,
20 int contents_unique_id, 21 int contents_unique_id,
21 const std::string& display_languages); 22 const std::string& display_languages);
22 23
24 virtual void Initialize(InfoBarService* infobar_service) OVERRIDE;
25 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.
23 private: 26 private:
24 virtual ~GeolocationInfoBarDelegateAndroid();
25 27
26 // ConfirmInfoBarDelegate: 28 // ConfirmInfoBarDelegate:
27 virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; 29 virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
28 virtual bool Accept() OVERRIDE; 30 virtual bool Accept() OVERRIDE;
29 31
32 void CheckLocationSettings(InfoBarService* infobar_service);
33
30 scoped_ptr<GoogleLocationSettingsHelper> google_location_settings_helper_; 34 scoped_ptr<GoogleLocationSettingsHelper> google_location_settings_helper_;
31 35
36 bool is_allow_label;
joth 2013/08/20 23:07:21 trailing _
acleung1 2013/08/23 23:13:09 Done.
37
32 DISALLOW_COPY_AND_ASSIGN(GeolocationInfoBarDelegateAndroid); 38 DISALLOW_COPY_AND_ASSIGN(GeolocationInfoBarDelegateAndroid);
33 }; 39 };
34 40
35 #endif // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_ANDROID_H_ 41 #endif // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698