OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include "chrome/browser/media/tab_capture_access_handler.h" | 5 #include "chrome/browser/media/tab_capture_access_handler.h" |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h" | 9 #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h" |
8 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 10 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
9 #include "chrome/browser/media/media_stream_capture_indicator.h" | 11 #include "chrome/browser/media/media_stream_capture_indicator.h" |
10 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
11 #include "content/public/browser/web_contents.h" | 13 #include "content/public/browser/web_contents.h" |
12 #include "extensions/common/permissions/permissions_data.h" | 14 #include "extensions/common/permissions/permissions_data.h" |
13 | 15 |
14 TabCaptureAccessHandler::TabCaptureAccessHandler() { | 16 TabCaptureAccessHandler::TabCaptureAccessHandler() { |
15 } | 17 } |
16 | 18 |
(...skipping 17 matching lines...) Expand all Loading... |
34 | 36 |
35 void TabCaptureAccessHandler::HandleRequest( | 37 void TabCaptureAccessHandler::HandleRequest( |
36 content::WebContents* web_contents, | 38 content::WebContents* web_contents, |
37 const content::MediaStreamRequest& request, | 39 const content::MediaStreamRequest& request, |
38 const content::MediaResponseCallback& callback, | 40 const content::MediaResponseCallback& callback, |
39 const extensions::Extension* extension) { | 41 const extensions::Extension* extension) { |
40 content::MediaStreamDevices devices; | 42 content::MediaStreamDevices devices; |
41 scoped_ptr<content::MediaStreamUI> ui; | 43 scoped_ptr<content::MediaStreamUI> ui; |
42 | 44 |
43 if (!extension) | 45 if (!extension) |
44 callback.Run(devices, content::MEDIA_DEVICE_TAB_CAPTURE_FAILURE, ui.Pass()); | 46 callback.Run(devices, content::MEDIA_DEVICE_TAB_CAPTURE_FAILURE, |
| 47 std::move(ui)); |
45 | 48 |
46 Profile* profile = | 49 Profile* profile = |
47 Profile::FromBrowserContext(web_contents->GetBrowserContext()); | 50 Profile::FromBrowserContext(web_contents->GetBrowserContext()); |
48 extensions::TabCaptureRegistry* tab_capture_registry = | 51 extensions::TabCaptureRegistry* tab_capture_registry = |
49 extensions::TabCaptureRegistry::Get(profile); | 52 extensions::TabCaptureRegistry::Get(profile); |
50 if (!tab_capture_registry) { | 53 if (!tab_capture_registry) { |
51 NOTREACHED(); | 54 NOTREACHED(); |
52 callback.Run(devices, content::MEDIA_DEVICE_INVALID_STATE, ui.Pass()); | 55 callback.Run(devices, content::MEDIA_DEVICE_INVALID_STATE, std::move(ui)); |
53 return; | 56 return; |
54 } | 57 } |
55 const bool tab_capture_allowed = tab_capture_registry->VerifyRequest( | 58 const bool tab_capture_allowed = tab_capture_registry->VerifyRequest( |
56 request.render_process_id, request.render_frame_id, extension->id()); | 59 request.render_process_id, request.render_frame_id, extension->id()); |
57 | 60 |
58 if (request.audio_type == content::MEDIA_TAB_AUDIO_CAPTURE && | 61 if (request.audio_type == content::MEDIA_TAB_AUDIO_CAPTURE && |
59 tab_capture_allowed && | 62 tab_capture_allowed && |
60 extension->permissions_data()->HasAPIPermission( | 63 extension->permissions_data()->HasAPIPermission( |
61 extensions::APIPermission::kTabCapture)) { | 64 extensions::APIPermission::kTabCapture)) { |
62 devices.push_back(content::MediaStreamDevice( | 65 devices.push_back(content::MediaStreamDevice( |
63 content::MEDIA_TAB_AUDIO_CAPTURE, std::string(), std::string())); | 66 content::MEDIA_TAB_AUDIO_CAPTURE, std::string(), std::string())); |
64 } | 67 } |
65 | 68 |
66 if (request.video_type == content::MEDIA_TAB_VIDEO_CAPTURE && | 69 if (request.video_type == content::MEDIA_TAB_VIDEO_CAPTURE && |
67 tab_capture_allowed && | 70 tab_capture_allowed && |
68 extension->permissions_data()->HasAPIPermission( | 71 extension->permissions_data()->HasAPIPermission( |
69 extensions::APIPermission::kTabCapture)) { | 72 extensions::APIPermission::kTabCapture)) { |
70 devices.push_back(content::MediaStreamDevice( | 73 devices.push_back(content::MediaStreamDevice( |
71 content::MEDIA_TAB_VIDEO_CAPTURE, std::string(), std::string())); | 74 content::MEDIA_TAB_VIDEO_CAPTURE, std::string(), std::string())); |
72 } | 75 } |
73 | 76 |
74 if (!devices.empty()) { | 77 if (!devices.empty()) { |
75 ui = MediaCaptureDevicesDispatcher::GetInstance() | 78 ui = MediaCaptureDevicesDispatcher::GetInstance() |
76 ->GetMediaStreamCaptureIndicator() | 79 ->GetMediaStreamCaptureIndicator() |
77 ->RegisterMediaStream(web_contents, devices); | 80 ->RegisterMediaStream(web_contents, devices); |
78 } | 81 } |
79 callback.Run(devices, devices.empty() ? content::MEDIA_DEVICE_INVALID_STATE | 82 callback.Run(devices, devices.empty() ? content::MEDIA_DEVICE_INVALID_STATE |
80 : content::MEDIA_DEVICE_OK, | 83 : content::MEDIA_DEVICE_OK, |
81 ui.Pass()); | 84 std::move(ui)); |
82 } | 85 } |
OLD | NEW |