Permissions: Allow control of individual requests in media permission infobars

chrome/browser/permissions/grouped_permission_infobar_delegate.cc

Index: chrome/browser/permissions/grouped_permission_infobar_delegate.cc
diff --git a/chrome/browser/permissions/grouped_permission_infobar_delegate.cc b/chrome/browser/permissions/grouped_permission_infobar_delegate.cc
index 6757f95ce698bdaf1a7a9782d1e05c43252b9b34..f365b4c449953c36bd08b86402b2aa5c4b1e099b 100644
--- a/chrome/browser/permissions/grouped_permission_infobar_delegate.cc
+++ b/chrome/browser/permissions/grouped_permission_infobar_delegate.cc
@@ -11,7 +11,10 @@
 GroupedPermissionInfoBarDelegate::GroupedPermissionInfoBarDelegate(
     const GURL& requesting_origin,
     const std::vector<ContentSettingsType>& types)
-    : requesting_origin_(requesting_origin), types_(types) {}
+    : requesting_origin_(requesting_origin),
+      types_(types),
+      accept_states_(types_.size(), true) {

[benwells, 2016/06/06 01:10:02]

Super nit: {} on same line to match destructor.

[tsergeant, 2016/06/06 02:43:55]

Done.

+}
 
 GroupedPermissionInfoBarDelegate::~GroupedPermissionInfoBarDelegate() {}
 
@@ -20,10 +23,21 @@ GroupedPermissionInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
+int GroupedPermissionInfoBarDelegate::GetButtons() const {
+  if (GetPermissionCount() >= 2)
+    return ConfirmInfoBarDelegate::InfoBarButton::BUTTON_OK;
+  else
+    return ConfirmInfoBarDelegate::GetButtons();
+}
+
 base::string16 GroupedPermissionInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
-  return l10n_util::GetStringUTF16(
-      (button == BUTTON_OK) ? IDS_PERMISSION_ALLOW : IDS_PERMISSION_DENY);
+  if (GetPermissionCount() >= 2) {
+    return ConfirmInfoBarDelegate::GetButtonLabel(button);
+  } else {
+    return l10n_util::GetStringUTF16(
+        (button == BUTTON_OK) ? IDS_PERMISSION_ALLOW : IDS_PERMISSION_DENY);
+  }
 }
 
 base::string16 GroupedPermissionInfoBarDelegate::GetMessageText() const {
@@ -68,3 +82,14 @@ base::string16 GroupedPermissionInfoBarDelegate::GetMessageTextFragment(
   }
   return l10n_util::GetStringUTF16(message_id);
 }
+
+void GroupedPermissionInfoBarDelegate::ToggleAccept(int position,
+                                                    bool new_value) {
+  DCHECK(position >= 0 && position < static_cast<int>(types_.size()));
+  accept_states_[position] = new_value;
+}
+
+bool GroupedPermissionInfoBarDelegate::GetAcceptState(int position) {
+  DCHECK(position >= 0 && position < static_cast<int>(types_.size()));
+  return accept_states_[position];
+}