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

Side by Side Diff: chrome/browser/media/webrtc/media_stream_devices_controller.h

Issue 2254763002: Enable the optional permission prompt persistence toggle on grouped infobars (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission-infobardelegate-clean
Patch Set: DCHECK -> CHECK Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_DEVICES_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_DEVICES_CONTROLLER_H_
6 #define CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_DEVICES_CONTROLLER_H_ 6 #define CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_DEVICES_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "chrome/browser/permissions/permission_request.h" 12 #include "chrome/browser/permissions/permission_request.h"
13 #include "components/content_settings/core/common/content_settings.h" 13 #include "components/content_settings/core/common/content_settings.h"
14 #include "content/public/browser/permission_type.h"
14 #include "content/public/browser/web_contents_delegate.h" 15 #include "content/public/browser/web_contents_delegate.h"
15 16
16 class Profile; 17 class Profile;
17 class TabSpecificContentSettings; 18 class TabSpecificContentSettings;
18 19
19 namespace content { 20 namespace content {
20 class WebContents; 21 class WebContents;
21 } 22 }
22 23
23 namespace user_prefs { 24 namespace user_prefs {
(...skipping 10 matching lines...) Expand all
34 35
35 // Registers the prefs backing the audio and video policies. 36 // Registers the prefs backing the audio and video policies.
36 static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); 37 static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
37 38
38 bool IsAllowedForAudio() const; 39 bool IsAllowedForAudio() const;
39 bool IsAllowedForVideo() const; 40 bool IsAllowedForVideo() const;
40 bool IsAskingForAudio() const; 41 bool IsAskingForAudio() const;
41 bool IsAskingForVideo() const; 42 bool IsAskingForVideo() const;
42 base::string16 GetMessageText() const; 43 base::string16 GetMessageText() const;
43 44
45 // Returns the PermissionsType associated with the provided
46 // ContentSettingsType. |content_type| must be a media stream type.
47 content::PermissionType GetPermissionTypeForContentSettingsType(
48 ContentSettingsType content_type) const;
49
44 // Forces the permissions to be denied (without being persisted) regardless 50 // Forces the permissions to be denied (without being persisted) regardless
45 // of what the previous state was. If the user had previously allowed the 51 // of what the previous state was. If the user had previously allowed the
46 // site video or audio access, this ignores that and informs the site it was 52 // site video or audio access, this ignores that and informs the site it was
47 // denied. 53 // denied.
48 // 54 //
49 // This differs from PermissionGranted/PermissionDenied as they only operate 55 // This differs from PermissionGranted/PermissionDenied as they only operate
50 // on the permissions if they are in the ASK state. 56 // on the permissions if they are in the ASK state.
51 void ForcePermissionDeniedTemporarily(); 57 void ForcePermissionDeniedTemporarily();
52 58
53 // Answers a permission request with (possibly) different values for 59 // Answers a permission request with (possibly) different values for
54 // |audio_accepted| and |video_accepted|. Intended for use from 60 // |audio_accepted| and |video_accepted|. Intended for use from
55 // MediaStreamInfobarDelegateAndroid. 61 // MediaStreamInfobarDelegateAndroid.
56 // TODO(tsergeant): Remove this by refactoring Android to use 62 // TODO(tsergeant): Remove this by refactoring Android to use
57 // PermissionRequest instead of a custom infobar delegate. 63 // PermissionRequest instead of a custom infobar delegate.
58 void GroupedRequestFinished(bool audio_accepted, bool video_accepted); 64 void GroupedRequestFinished(bool audio_accepted, bool video_accepted);
59 65
66 bool persist() const { return persist_; }
67 void set_persist(bool persist) { persist_ = persist; }
68
60 // PermissionRequest: 69 // PermissionRequest:
61 int GetIconId() const override; 70 int GetIconId() const override;
62 base::string16 GetMessageTextFragment() const override; 71 base::string16 GetMessageTextFragment() const override;
63 GURL GetOrigin() const override; 72 GURL GetOrigin() const override;
64 void PermissionGranted() override; 73 void PermissionGranted() override;
65 void PermissionDenied() override; 74 void PermissionDenied() override;
66 void Cancelled() override; 75 void Cancelled() override;
67 void RequestFinished() override; 76 void RequestFinished() override;
68 PermissionRequestType GetPermissionRequestType() const override; 77 PermissionRequestType GetPermissionRequestType() const override;
69 78
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 TabSpecificContentSettings* content_settings_; 134 TabSpecificContentSettings* content_settings_;
126 135
127 // The original request for access to devices. 136 // The original request for access to devices.
128 const content::MediaStreamRequest request_; 137 const content::MediaStreamRequest request_;
129 138
130 // The callback that needs to be Run to notify WebRTC of whether access to 139 // The callback that needs to be Run to notify WebRTC of whether access to
131 // audio/video devices was granted or not. 140 // audio/video devices was granted or not.
132 content::MediaResponseCallback callback_; 141 content::MediaResponseCallback callback_;
133 142
134 // Whether the permissions granted or denied by the user should be persisted. 143 // Whether the permissions granted or denied by the user should be persisted.
135 bool persist_permission_changes_; 144 bool persist_;
136 145
137 DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesController); 146 DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesController);
138 }; 147 };
139 148
140 #endif // CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_DEVICES_CONTROLLER_H_ 149 #endif // CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_DEVICES_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698