| OLD | NEW |
| 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_MEDIA_STREAM_DEVICES_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_ |
| 6 #define CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_ | 6 #define CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 // on the permissions if they are in the ASK state. | 55 // on the permissions if they are in the ASK state. |
| 56 void ForcePermissionDeniedTemporarily(); | 56 void ForcePermissionDeniedTemporarily(); |
| 57 | 57 |
| 58 // Answers a permission request with (possibly) different values for | 58 // Answers a permission request with (possibly) different values for |
| 59 // |audio_accepted| and |video_accepted|. Intended for use from | 59 // |audio_accepted| and |video_accepted|. Intended for use from |
| 60 // MediaStreamInfobarDelegateAndroid. | 60 // MediaStreamInfobarDelegateAndroid. |
| 61 // TODO(tsergeant): Remove this by refactoring Android to use | 61 // TODO(tsergeant): Remove this by refactoring Android to use |
| 62 // PermissionRequest instead of a custom infobar delegate. | 62 // PermissionRequest instead of a custom infobar delegate. |
| 63 void GroupedRequestFinished(bool audio_accepted, bool video_accepted); | 63 void GroupedRequestFinished(bool audio_accepted, bool video_accepted); |
| 64 | 64 |
| 65 bool persist() const { return persist_; } | 65 bool ShouldShowPersistenceToggle() const override; |
| 66 void set_persist(bool persist) { persist_ = persist; } | |
| 67 | 66 |
| 68 // PermissionRequest: | 67 // PermissionRequest: |
| 69 int GetIconId() const override; | 68 int GetIconId() const override; |
| 70 base::string16 GetMessageTextFragment() const override; | 69 base::string16 GetMessageTextFragment() const override; |
| 71 GURL GetOrigin() const override; | 70 GURL GetOrigin() const override; |
| 72 void PermissionGranted() override; | 71 void PermissionGranted() override; |
| 73 void PermissionDenied() override; | 72 void PermissionDenied() override; |
| 74 void Cancelled() override; | 73 void Cancelled() override; |
| 75 void RequestFinished() override; | 74 void RequestFinished() override; |
| 76 PermissionRequestType GetPermissionRequestType() const override; | 75 PermissionRequestType GetPermissionRequestType() const override; |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 // was created. | 131 // was created. |
| 133 TabSpecificContentSettings* content_settings_; | 132 TabSpecificContentSettings* content_settings_; |
| 134 | 133 |
| 135 // The original request for access to devices. | 134 // The original request for access to devices. |
| 136 const content::MediaStreamRequest request_; | 135 const content::MediaStreamRequest request_; |
| 137 | 136 |
| 138 // The callback that needs to be Run to notify WebRTC of whether access to | 137 // The callback that needs to be Run to notify WebRTC of whether access to |
| 139 // audio/video devices was granted or not. | 138 // audio/video devices was granted or not. |
| 140 content::MediaResponseCallback callback_; | 139 content::MediaResponseCallback callback_; |
| 141 | 140 |
| 142 // Whether the permissions granted or denied by the user should be persisted. | |
| 143 bool persist_; | |
| 144 | |
| 145 DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesController); | 141 DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesController); |
| 146 }; | 142 }; |
| 147 | 143 |
| 148 #endif // CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_ | 144 #endif // CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_ |
| OLD | NEW |