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

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: addresses 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 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: 14 public:
15 GeolocationInfoBarDelegateAndroid( 15 GeolocationInfoBarDelegateAndroid(
16 InfoBarService* infobar_service, 16 InfoBarService* infobar_service,
17 PermissionQueueController* controller, 17 PermissionQueueController* controller,
18 const PermissionRequestID& id, 18 const PermissionRequestID& id,
19 const GURL& requesting_frame_url, 19 const GURL& requesting_frame_url,
20 int contents_unique_id, 20 int contents_unique_id,
21 const std::string& display_languages); 21 const std::string& display_languages);
22 22
23 protected:
24 virtual void Show(InfoBarService* infobar_service) OVERRIDE;
25
23 private: 26 private:
24 virtual ~GeolocationInfoBarDelegateAndroid(); 27 virtual ~GeolocationInfoBarDelegateAndroid();
25 28
26 // ConfirmInfoBarDelegate: 29 // ConfirmInfoBarDelegate:
27 virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; 30 virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
28 virtual bool Accept() OVERRIDE; 31 virtual bool Accept() OVERRIDE;
29 32
33 void CallParentShow(InfoBarService* infobar_service);
34
35 void CheckLocationSettings(InfoBarService* infobar_service);
36
30 scoped_ptr<GoogleLocationSettingsHelper> google_location_settings_helper_; 37 scoped_ptr<GoogleLocationSettingsHelper> google_location_settings_helper_;
31 38
39 bool is_allow_label_;
40
32 DISALLOW_COPY_AND_ASSIGN(GeolocationInfoBarDelegateAndroid); 41 DISALLOW_COPY_AND_ASSIGN(GeolocationInfoBarDelegateAndroid);
33 }; 42 };
34 43
35 #endif // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_ANDROID_H_ 44 #endif // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698