| 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 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h" | 5 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h" |
| 6 | 6 |
| 7 #include "content/browser/browser_main_loop.h" | 7 #include "content/browser/browser_main_loop.h" |
| 8 #include "content/common/media/media_stream_messages.h" | 8 #include "content/common/media/media_stream_messages.h" |
| 9 #include "content/common/media/media_stream_options.h" | 9 #include "content/common/media/media_stream_options.h" |
| 10 #include "url/gurl.h" | 10 #include "url/gurl.h" |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 media_stream_manager_->CancelAllRequests(render_process_id_); | 114 media_stream_manager_->CancelAllRequests(render_process_id_); |
| 115 } | 115 } |
| 116 | 116 |
| 117 MediaStreamDispatcherHost::~MediaStreamDispatcherHost() { | 117 MediaStreamDispatcherHost::~MediaStreamDispatcherHost() { |
| 118 } | 118 } |
| 119 | 119 |
| 120 void MediaStreamDispatcherHost::OnGenerateStream( | 120 void MediaStreamDispatcherHost::OnGenerateStream( |
| 121 int render_view_id, | 121 int render_view_id, |
| 122 int page_request_id, | 122 int page_request_id, |
| 123 const StreamOptions& components, | 123 const StreamOptions& components, |
| 124 const GURL& security_origin) { | 124 const GURL& security_origin, |
| 125 bool user_gesture) { |
| 125 DVLOG(1) << "MediaStreamDispatcherHost::OnGenerateStream(" | 126 DVLOG(1) << "MediaStreamDispatcherHost::OnGenerateStream(" |
| 126 << render_view_id << ", " | 127 << render_view_id << ", " |
| 127 << page_request_id << ", [" | 128 << page_request_id << ", [" |
| 128 << " audio:" << components.audio_requested | 129 << " audio:" << components.audio_requested |
| 129 << " video:" << components.video_requested | 130 << " video:" << components.video_requested |
| 130 << " ], " | 131 << " ], " |
| 131 << security_origin.spec() << ")"; | 132 << security_origin.spec() |
| 133 << ", " << user_gesture << ")"; |
| 132 | 134 |
| 133 media_stream_manager_->GenerateStream( | 135 media_stream_manager_->GenerateStream( |
| 134 this, render_process_id_, render_view_id, salt_callback_, | 136 this, render_process_id_, render_view_id, salt_callback_, |
| 135 page_request_id, components, security_origin); | 137 page_request_id, components, security_origin, user_gesture); |
| 136 } | 138 } |
| 137 | 139 |
| 138 void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_view_id, | 140 void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_view_id, |
| 139 int page_request_id) { | 141 int page_request_id) { |
| 140 DVLOG(1) << "MediaStreamDispatcherHost::OnCancelGenerateStream(" | 142 DVLOG(1) << "MediaStreamDispatcherHost::OnCancelGenerateStream(" |
| 141 << render_view_id << ", " | 143 << render_view_id << ", " |
| 142 << page_request_id << ")"; | 144 << page_request_id << ")"; |
| 143 media_stream_manager_->CancelRequest(render_process_id_, render_view_id, | 145 media_stream_manager_->CancelRequest(render_process_id_, render_view_id, |
| 144 page_request_id); | 146 page_request_id); |
| 145 } | 147 } |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 int render_view_id, | 205 int render_view_id, |
| 204 const std::string& label) { | 206 const std::string& label) { |
| 205 DVLOG(1) << "MediaStreamDispatcherHost::OnCloseDevice(" | 207 DVLOG(1) << "MediaStreamDispatcherHost::OnCloseDevice(" |
| 206 << render_view_id << ", " | 208 << render_view_id << ", " |
| 207 << label << ")"; | 209 << label << ")"; |
| 208 | 210 |
| 209 media_stream_manager_->CancelRequest(label); | 211 media_stream_manager_->CancelRequest(label); |
| 210 } | 212 } |
| 211 | 213 |
| 212 } // namespace content | 214 } // namespace content |
| OLD | NEW |