Index: chrome/browser/media/webrtc/media_stream_devices_controller.h |
diff --git a/chrome/browser/media/webrtc/media_stream_devices_controller.h b/chrome/browser/media/webrtc/media_stream_devices_controller.h |
index 1b4246aec67d41fb81c17d15b6ba8e53faefeddf..c64693645d851b129f2278f759d7e4f64fa70aa6 100644 |
--- a/chrome/browser/media/webrtc/media_stream_devices_controller.h |
+++ b/chrome/browser/media/webrtc/media_stream_devices_controller.h |
@@ -11,6 +11,7 @@ |
#include "base/macros.h" |
#include "chrome/browser/permissions/permission_request.h" |
#include "components/content_settings/core/common/content_settings.h" |
+#include "content/public/browser/permission_type.h" |
#include "content/public/browser/web_contents_delegate.h" |
class Profile; |
@@ -41,6 +42,11 @@ class MediaStreamDevicesController : public PermissionRequest { |
bool IsAskingForVideo() const; |
base::string16 GetMessageText() const; |
+ // Returns the PermissionsType associated with the provided |
+ // ContentSettingsType. |content_type| must be a media stream type. |
+ content::PermissionType GetPermissionTypeForContentSettingsType( |
+ ContentSettingsType content_type) const; |
+ |
// Forces the permissions to be denied (without being persisted) regardless |
// of what the previous state was. If the user had previously allowed the |
// site video or audio access, this ignores that and informs the site it was |
@@ -57,6 +63,9 @@ class MediaStreamDevicesController : public PermissionRequest { |
// PermissionRequest instead of a custom infobar delegate. |
void GroupedRequestFinished(bool audio_accepted, bool video_accepted); |
+ bool persist() const { return persist_; } |
+ void set_persist(bool persist) { persist_ = persist; } |
+ |
// PermissionRequest: |
int GetIconId() const override; |
base::string16 GetMessageTextFragment() const override; |
@@ -132,7 +141,7 @@ class MediaStreamDevicesController : public PermissionRequest { |
content::MediaResponseCallback callback_; |
// Whether the permissions granted or denied by the user should be persisted. |
- bool persist_permission_changes_; |
+ bool persist_; |
DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesController); |
}; |