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

Side by Side Diff: chrome/browser/geolocation/geolocation_infobar_delegate.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 / fix tests Created 6 years, 10 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_H_ 5 #ifndef CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_H_
6 #define CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_H_ 6 #define CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "chrome/browser/content_settings/permission_request_id.h" 10 #include "chrome/browser/content_settings/permission_request_id.h"
11 #include "chrome/browser/infobars/confirm_infobar_delegate.h" 11 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
12 #include "url/gurl.h" 12 #include "url/gurl.h"
13 13
14 class PermissionQueueController; 14 class PermissionQueueController;
15 class InfoBarService; 15 class InfoBarService;
16 16
17 // GeolocationInfoBarDelegates are created by the 17 // GeolocationInfoBarDelegates are created by the
18 // GeolocationInfoBarQueueController to control the display 18 // GeolocationInfoBarQueueController to control the display
19 // and handling of geolocation permission infobars to the user. 19 // and handling of geolocation permission infobars to the user.
20 class GeolocationInfoBarDelegate : public ConfirmInfoBarDelegate { 20 class GeolocationInfoBarDelegate : public ConfirmInfoBarDelegate {
21 public: 21 public:
22 // Creates a geolocation infobar and delegate and adds the infobar to 22 // Creates a geolocation infobar and delegate and adds the infobar to
23 // |infobar_service|. Returns the infobar if it was successfully added. 23 // |infobar_service|. Returns the infobar if it was successfully added.
24 static InfoBar* Create(InfoBarService* infobar_service, 24 static InfoBar* Create(InfoBarService* infobar_service,
25 PermissionQueueController* controller, 25 PermissionQueueController* controller,
26 const PermissionRequestID& id, 26 const PermissionRequestID& id,
27 const GURL& requesting_frame, 27 const GURL& requesting_frame,
28 const std::string& display_languages); 28 const std::string& display_languages,
29 const std::string& accept_button_label);
29 30
30 protected: 31 protected:
31 GeolocationInfoBarDelegate(PermissionQueueController* controller, 32 GeolocationInfoBarDelegate(PermissionQueueController* controller,
32 const PermissionRequestID& id, 33 const PermissionRequestID& id,
33 const GURL& requesting_frame, 34 const GURL& requesting_frame,
34 int contents_unique_id, 35 int contents_unique_id,
35 const std::string& display_languages); 36 const std::string& display_languages,
37 const std::string& accept_button_label);
36 virtual ~GeolocationInfoBarDelegate(); 38 virtual ~GeolocationInfoBarDelegate();
37 39
38 // ConfirmInfoBarDelegate: 40 // ConfirmInfoBarDelegate:
39 virtual bool Accept() OVERRIDE; 41 virtual bool Accept() OVERRIDE;
40 42
41 // Call back to the controller, to inform of the user's decision. 43 // Call back to the controller, to inform of the user's decision.
42 void SetPermission(bool update_content_setting, bool allowed); 44 void SetPermission(bool update_content_setting, bool allowed);
43 45
44 // Marks a flag internally to indicate that the user has interacted with the 46 // Marks a flag internally to indicate that the user has interacted with the
45 // bar. This makes it possible to log from the destructor when the bar has not 47 // bar. This makes it possible to log from the destructor when the bar has not
(...skipping 21 matching lines...) Expand all
67 int contents_unique_id_; 69 int contents_unique_id_;
68 std::string display_languages_; 70 std::string display_languages_;
69 71
70 // Whether the user has interacted with the geolocation infobar. 72 // Whether the user has interacted with the geolocation infobar.
71 bool user_has_interacted_; 73 bool user_has_interacted_;
72 74
73 DISALLOW_COPY_AND_ASSIGN(GeolocationInfoBarDelegate); 75 DISALLOW_COPY_AND_ASSIGN(GeolocationInfoBarDelegate);
74 }; 76 };
75 77
76 #endif // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_H_ 78 #endif // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_INFOBAR_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698