Chromium Code Reviews| 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_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 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 45 Request(Profile* profile, | 45 Request(Profile* profile, |
| 46 bool is_asking_for_audio, | 46 bool is_asking_for_audio, |
| 47 bool is_asking_for_video, | 47 bool is_asking_for_video, |
| 48 const GURL& security_origin, | 48 const GURL& security_origin, |
| 49 PromptAnsweredCallback prompt_answered_callback); | 49 PromptAnsweredCallback prompt_answered_callback); |
| 50 | 50 |
| 51 ~Request() override; | 51 ~Request() override; |
| 52 | 52 |
| 53 bool IsAskingForAudio() const; | 53 bool IsAskingForAudio() const; |
| 54 bool IsAskingForVideo() const; | 54 bool IsAskingForVideo() const; |
| 55 base::string16 GetMessageText() const; | 55 base::string16 GetMessageText() const override; |
|
raymes
2017/05/29 04:48:27
nit: this should move down with the other override
Timothy Loh
2017/05/30 05:02:34
Moved here and in the .cc
| |
| 56 | 56 |
| 57 // PermissionRequest: | 57 // PermissionRequest: |
| 58 IconId GetIconId() const override; | 58 IconId GetIconId() const override; |
| 59 base::string16 GetMessageTextFragment() const override; | 59 base::string16 GetMessageTextFragment() const override; |
| 60 GURL GetOrigin() const override; | 60 GURL GetOrigin() const override; |
| 61 void PermissionGranted() override; | 61 void PermissionGranted() override; |
| 62 void PermissionDenied() override; | 62 void PermissionDenied() override; |
| 63 void Cancelled() override; | 63 void Cancelled() override; |
| 64 void RequestFinished() override; | 64 void RequestFinished() override; |
| 65 PermissionRequestType GetPermissionRequestType() const override; | 65 PermissionRequestType GetPermissionRequestType() const override; |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 189 // The callback that needs to be Run to notify WebRTC of whether access to | 189 // The callback that needs to be Run to notify WebRTC of whether access to |
| 190 // audio/video devices was granted or not. | 190 // audio/video devices was granted or not. |
| 191 content::MediaResponseCallback callback_; | 191 content::MediaResponseCallback callback_; |
| 192 | 192 |
| 193 std::unique_ptr<PermissionPromptDelegate> delegate_; | 193 std::unique_ptr<PermissionPromptDelegate> delegate_; |
| 194 | 194 |
| 195 DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesController); | 195 DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesController); |
| 196 }; | 196 }; |
| 197 | 197 |
| 198 #endif // CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_DEVICES_CONTROLLER_H_ | 198 #endif // CHROME_BROWSER_MEDIA_WEBRTC_MEDIA_STREAM_DEVICES_CONTROLLER_H_ |
| OLD | NEW |