Add a feature to display a persistence toggle for permission prompts on Android.

chrome/browser/permissions/permission_infobar_delegate.cc

Index: chrome/browser/permissions/permission_infobar_delegate.cc
diff --git a/chrome/browser/permissions/permission_infobar_delegate.cc b/chrome/browser/permissions/permission_infobar_delegate.cc
index 46282a3a19657e6c29f6d8ea8a980e4d0a595370..9267b571b16938321b3a0c526f770849ae047f81 100644
--- a/chrome/browser/permissions/permission_infobar_delegate.cc
+++ b/chrome/browser/permissions/permission_infobar_delegate.cc
@@ -4,14 +4,20 @@
 
 #include "chrome/browser/permissions/permission_infobar_delegate.h"
 
+#include "base/feature_list.h"
 #include "chrome/browser/permissions/permission_decision_auto_blocker.h"
 #include "chrome/browser/permissions/permission_request.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/grit/generated_resources.h"
-#include "components/infobars/core/infobar.h"
 #include "components/url_formatter/elide_url.h"
 #include "ui/base/l10n/l10n_util.h"
 
+bool PermissionInfobarDelegate::ShouldShowPersistenceToggle() const {
+  return base::FeatureList::IsEnabled(
+      features::kDisplayPersistenceToggleInPermissionPrompts);
+}

[raymes, 2016/08/16 01:44:53]

ordering is a funny thing but usually the constructor/destructor come first in
the cc file so perhaps move this down

[dominickn, 2016/08/16 03:06:50]

Done.

+
 PermissionInfobarDelegate::~PermissionInfobarDelegate() {
   if (!action_taken_) {
     PermissionDecisionAutoBlocker(profile_).RecordIgnore(requesting_origin_,
@@ -31,14 +37,15 @@ PermissionInfobarDelegate::PermissionInfobarDelegate(
     ContentSettingsType content_settings_type,
     bool user_gesture,
     Profile* profile,
-    const base::Callback<void(bool, bool)>& callback)
+    const PermissionSetCallback& callback)
     : requesting_origin_(requesting_origin),
-      action_taken_(false),
       permission_type_(permission_type),
       content_settings_type_(content_settings_type),
-      user_gesture_(user_gesture),
       profile_(profile),
-      callback_(callback) {}
+      callback_(callback),
+      action_taken_(false),
+      user_gesture_(user_gesture),
+      persist_(true) {}
 
 base::string16 PermissionInfobarDelegate::GetMessageText() const {
   return l10n_util::GetStringFUTF16(
@@ -54,7 +61,7 @@ infobars::InfoBarDelegate::Type PermissionInfobarDelegate::GetInfoBarType()
 }
 
 void PermissionInfobarDelegate::InfoBarDismissed() {
-  SetPermission(false, false);
+  SetPermission(false, DISMISSED);
 }
 
 PermissionInfobarDelegate*
@@ -69,17 +76,31 @@ base::string16 PermissionInfobarDelegate::GetButtonLabel(
 }
 
 bool PermissionInfobarDelegate::Accept() {
-  SetPermission(true, true);
+  bool update_content_setting = true;
+  if (ShouldShowPersistenceToggle()) {
+    update_content_setting = persist_;
+    PermissionUmaUtil::PermissionPromptAcceptedWithPersistenceToggle(
+        permission_type_, persist_);
+  }
+
+  SetPermission(update_content_setting, GRANTED);
   return true;
 }
 
 bool PermissionInfobarDelegate::Cancel() {
-  SetPermission(true, false);
+  bool update_content_setting = true;
+  if (ShouldShowPersistenceToggle()) {
+    update_content_setting = persist_;
+    PermissionUmaUtil::PermissionPromptDeniedWithPersistenceToggle(
+        permission_type_, persist_);
+  }
+
+  SetPermission(update_content_setting, DENIED);
   return true;
 }
 
 void PermissionInfobarDelegate::SetPermission(bool update_content_setting,
-                                              bool allowed) {
+                                              PermissionAction decision) {
   action_taken_ = true;
-  callback_.Run(update_content_setting, allowed);
+  callback_.Run(update_content_setting, decision);
 }