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

Unified Diff: chrome/browser/permissions/grouped_permission_infobar_delegate_android.h

Issue 2339863002: Use vector of PermissionRequest instead of ContentSettingsTypes for GroupedPermissionInfoBarDelegate (Closed)
Patch Set: fix patch failure Created 4 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/permissions/grouped_permission_infobar_delegate_android.h
diff --git a/chrome/browser/permissions/grouped_permission_infobar_delegate_android.h b/chrome/browser/permissions/grouped_permission_infobar_delegate_android.h
index 7e48c6c77705da0f942c444cf509f64c377a01eb..7971869757fd362371073c7d363027e8ca91e438 100644
--- a/chrome/browser/permissions/grouped_permission_infobar_delegate_android.h
+++ b/chrome/browser/permissions/grouped_permission_infobar_delegate_android.h
@@ -13,6 +13,7 @@
class GURL;
class InfoBarService;
+class PermissionRequest;
// An InfoBar that displays a group of permission requests, each of which can be
// allowed or blocked independently.
@@ -25,11 +26,11 @@ class GroupedPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
static infobars::InfoBar* Create(
InfoBarService* infobar_service,
const GURL& requesting_origin,
- const std::vector<ContentSettingsType>& types);
+ const std::vector<PermissionRequest*>& requests);
bool persist() const { return persist_; }
void set_persist(bool persist) { persist_ = persist; }
- size_t permission_count() const { return types_.size(); }
+ size_t permission_count() const { return requests_.size(); }
// Returns true if the infobar should display a toggle to allow users to
// opt-out of persisting their accept/deny decision.
@@ -53,7 +54,7 @@ class GroupedPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
private:
GroupedPermissionInfoBarDelegate(
const GURL& requesting_origin,
- const std::vector<ContentSettingsType>& types);
+ const std::vector<PermissionRequest*>& requests);
// ConfirmInfoBarDelegate:
InfoBarIdentifier GetIdentifier() const override;
@@ -62,7 +63,7 @@ class GroupedPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
base::string16 GetButtonLabel(InfoBarButton button) const override;
const GURL requesting_origin_;
- const std::vector<ContentSettingsType> types_;
+ const std::vector<PermissionRequest*> requests_;
std::vector<bool> accept_states_;
// Whether the accept/deny decision is persisted.
bool persist_;
« no previous file with comments | « no previous file | chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698