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

Side by Side Diff: chrome/browser/content_settings/permission_queue_controller.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, 9 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_CONTENT_SETTINGS_PERMISSION_QUEUE_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_QUEUE_CONTROLLER_H_
6 #define CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_QUEUE_CONTROLLER_H_ 6 #define CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_QUEUE_CONTROLLER_H_
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "chrome/common/content_settings_types.h" 9 #include "chrome/common/content_settings_types.h"
10 #include "content/public/browser/notification_observer.h" 10 #include "content/public/browser/notification_observer.h"
(...skipping 17 matching lines...) Expand all
28 typedef base::Callback<void(bool /* allowed */)> PermissionDecidedCallback; 28 typedef base::Callback<void(bool /* allowed */)> PermissionDecidedCallback;
29 29
30 PermissionQueueController(Profile* profile, ContentSettingsType type); 30 PermissionQueueController(Profile* profile, ContentSettingsType type);
31 virtual ~PermissionQueueController(); 31 virtual ~PermissionQueueController();
32 32
33 // The InfoBar will be displayed immediately if the tab is not already 33 // The InfoBar will be displayed immediately if the tab is not already
34 // displaying one, otherwise it'll be queued. 34 // displaying one, otherwise it'll be queued.
35 void CreateInfoBarRequest(const PermissionRequestID& id, 35 void CreateInfoBarRequest(const PermissionRequestID& id,
36 const GURL& requesting_frame, 36 const GURL& requesting_frame,
37 const GURL& embedder, 37 const GURL& embedder,
38 const std::string& accept_button_label,
38 PermissionDecidedCallback callback); 39 PermissionDecidedCallback callback);
39 40
40 // Cancels a specific infobar request. 41 // Cancels a specific infobar request.
41 void CancelInfoBarRequest(const PermissionRequestID& id); 42 void CancelInfoBarRequest(const PermissionRequestID& id);
42 43
43 // Cancels all infobar requests that match |group_id|. 44 // Cancels all infobar requests that match |group_id|.
44 void CancelInfoBarRequests(int group_id); 45 void CancelInfoBarRequests(int group_id);
45 46
46 // Called by the InfoBarDelegate to notify permission has been set. 47 // Called by the InfoBarDelegate to notify permission has been set.
47 // It'll notify and dismiss any other pending InfoBar request for the same 48 // It'll notify and dismiss any other pending InfoBar request for the same
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 88
88 Profile* const profile_; 89 Profile* const profile_;
89 ContentSettingsType type_; 90 ContentSettingsType type_;
90 PendingInfobarRequests pending_infobar_requests_; 91 PendingInfobarRequests pending_infobar_requests_;
91 bool in_shutdown_; 92 bool in_shutdown_;
92 93
93 DISALLOW_COPY_AND_ASSIGN(PermissionQueueController); 94 DISALLOW_COPY_AND_ASSIGN(PermissionQueueController);
94 }; 95 };
95 96
96 #endif // CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_QUEUE_CONTROLLER_H_ 97 #endif // CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_QUEUE_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698