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_manager.h" | 5 #include "content/browser/renderer_host/media/media_stream_manager.h" |
6 | 6 |
7 #include <list> | 7 #include <list> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
389 DCHECK(video_capture_manager_.get()); | 389 DCHECK(video_capture_manager_.get()); |
390 return video_capture_manager_.get(); | 390 return video_capture_manager_.get(); |
391 } | 391 } |
392 | 392 |
393 AudioInputDeviceManager* MediaStreamManager::audio_input_device_manager() { | 393 AudioInputDeviceManager* MediaStreamManager::audio_input_device_manager() { |
394 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 394 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
395 DCHECK(audio_input_device_manager_.get()); | 395 DCHECK(audio_input_device_manager_.get()); |
396 return audio_input_device_manager_.get(); | 396 return audio_input_device_manager_.get(); |
397 } | 397 } |
398 | 398 |
| 399 void MediaStreamManager::SetDisplayRotation(gfx::Display::Rotation rotation) { |
| 400 video_capture_manager()->SetDisplayRotation(rotation); |
| 401 } |
| 402 |
399 std::string MediaStreamManager::MakeMediaAccessRequest( | 403 std::string MediaStreamManager::MakeMediaAccessRequest( |
400 int render_process_id, | 404 int render_process_id, |
401 int render_view_id, | 405 int render_view_id, |
402 int page_request_id, | 406 int page_request_id, |
403 const StreamOptions& options, | 407 const StreamOptions& options, |
404 const GURL& security_origin, | 408 const GURL& security_origin, |
405 const MediaRequestResponseCallback& callback) { | 409 const MediaRequestResponseCallback& callback) { |
406 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 410 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
407 | 411 |
408 // TODO(perkj): The argument list with NULL parameters to DeviceRequest | 412 // TODO(perkj): The argument list with NULL parameters to DeviceRequest |
(...skipping 1532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1941 if (it->device.type == MEDIA_DESKTOP_VIDEO_CAPTURE) { | 1945 if (it->device.type == MEDIA_DESKTOP_VIDEO_CAPTURE) { |
1942 video_capture_manager_->SetDesktopCaptureWindowId(it->session_id, | 1946 video_capture_manager_->SetDesktopCaptureWindowId(it->session_id, |
1943 window_id); | 1947 window_id); |
1944 break; | 1948 break; |
1945 } | 1949 } |
1946 } | 1950 } |
1947 } | 1951 } |
1948 } | 1952 } |
1949 | 1953 |
1950 } // namespace content | 1954 } // namespace content |
OLD | NEW |