Enable the optional permission prompt persistence toggle on grouped infobars

chrome/browser/media/media_stream_devices_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media/media_stream_devices_controller.h"
 
 #include <map>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 14 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/url_formatter/elide_url.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/permission_type.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/common/media_stream_request.h"
 #include "content/public/common/origin_util.h"
 #include "extensions/common/constants.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
@@ skipping 204 matching lines @@
   if (!IsAskingForAudio())
     message_id = IDS_MEDIA_CAPTURE_VIDEO_ONLY;
   else if (!IsAskingForVideo())
     message_id = IDS_MEDIA_CAPTURE_AUDIO_ONLY;
   return l10n_util::GetStringFUTF16(
       message_id,
       url_formatter::FormatUrlForSecurityDisplay(
           GetOrigin(), url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC));
 }
 
+content::PermissionType
+MediaStreamDevicesController::GetPermissionTypeForContentSettingsType(

[raymes, 2016/08/18 06:10:00]

We might as well use GetPermissionType from permission_util

[dominickn, 2016/08/18 06:38:20]

Done.

[raymes, 2016/08/22 04:37:19]

I think we should just remove this and use PermissionUtil::GetPermissionType
directly in the callsites.

[dominickn, 2016/08/23 20:13:16]

GetPermissionType's signature is a little awkward; wrapping it in this method
makes it quite a bit nicer.

+    ContentSettingsType content_type) const {
+  if (content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) {
+    return content::PermissionType::AUDIO_CAPTURE;
+  } else {
+    DCHECK_EQ(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, content_type);
+    return content::PermissionType::VIDEO_CAPTURE;
+  }
+}
+
+void MediaStreamDevicesController::PermissionGranted(bool persist) {
+  base::AutoReset<bool> persist_permissions(
+      &persist_permission_changes_, persist);
+  PermissionGranted();
+}
+
+void MediaStreamDevicesController::PermissionDenied(bool persist) {
+  base::AutoReset<bool> persist_permissions(
+      &persist_permission_changes_, persist);
+  PermissionDenied();
+}
+
 void MediaStreamDevicesController::ForcePermissionDeniedTemporarily() {
   base::AutoReset<bool> persist_permissions(
       &persist_permission_changes_, false);
   // TODO(tsergeant): Determine whether it is appropriate to record permission
   // action metrics here, as this is a different sort of user action.
   RunCallback(CONTENT_SETTING_BLOCK,
               CONTENT_SETTING_BLOCK,
               content::MEDIA_DEVICE_PERMISSION_DENIED);
 }
 
@@ skipping 188 matching lines @@
     ContentSetting audio_setting,
     ContentSetting video_setting,
     content::MediaStreamRequestResult denial_reason) {
   CHECK(!callback_.is_null());
 
   // If the kill switch is on we don't update the tab context or persist the
   // setting.
   if (persist_permission_changes_ &&
       denial_reason != content::MEDIA_DEVICE_KILL_SWITCH_ON) {
     StorePermission(audio_setting, video_setting);
     UpdateTabSpecificContentSettings(audio_setting, video_setting);

[raymes, 2016/08/18 06:10:00]

Hmm, I'm worried that updating the tab context is important even if the setting
isn't being persisted.. I'm a bit surprised that this doesn't cause something to
break.

[dominickn, 2016/08/18 06:38:20]

I'm not sure I know this code well enough to make changes here, but I've changed
it to follow your suggestion. WDYT?

   }
 
   content::MediaStreamDevices devices =
       GetDevices(audio_setting, video_setting);
 
   // If either audio or video are allowed then the callback should report
   // success, otherwise we report |denial_reason|.
   content::MediaStreamRequestResult request_result = content::MEDIA_DEVICE_OK;
   if (audio_setting != CONTENT_SETTING_ALLOW &&
       video_setting != CONTENT_SETTING_ALLOW) {
@@ skipping 93 matching lines @@
   if (content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC)
     requested_device_id = request.requested_audio_device_id;
   else if (content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)
     requested_device_id = request.requested_video_device_id;
 
   if (!IsUserAcceptAllowed(content_type)) {
     *denial_reason = content::MEDIA_DEVICE_PERMISSION_DENIED;
     return CONTENT_SETTING_BLOCK;
   }
 
-  content::PermissionType permission_type;
-  if (content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) {
-    permission_type = content::PermissionType::AUDIO_CAPTURE;
-  } else {
-    DCHECK(content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
-    permission_type = content::PermissionType::VIDEO_CAPTURE;
-  }
-
+  content::PermissionType permission_type =
+      GetPermissionTypeForContentSettingsType(content_type);
   if (ContentTypeIsRequested(permission_type, request)) {
     DCHECK(content::IsOriginSecure(request_.security_origin) ||
            request_.request_type == content::MEDIA_OPEN_DEVICE_PEPPER_ONLY);
     MediaPermission permission(content_type, request.security_origin,
         web_contents_->GetLastCommittedURL().GetOrigin(), profile_);
     return permission.GetPermissionStatusWithDeviceRequired(requested_device_id,
                                                             denial_reason);
   }
   // Return the default content setting if the device is not requested.
   return CONTENT_SETTING_DEFAULT;
@@ skipping 40 matching lines @@
   if (android_permission_blocked)
     return false;
 
   // Don't approve device requests if the tab was hidden.
   // TODO(qinmin): Add a test for this. http://crbug.com/396869.
   // TODO(raymes): Shouldn't this apply to all permissions not just audio/video?
   return web_contents_->GetRenderWidgetHostView()->IsShowing();
 #endif
   return true;
 }