Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(737)

Side by Side Diff: content/browser/renderer_host/media/video_capture_manager.cc

Issue 2143903003: [WIP] Move media/capture to device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/video_capture_manager.h" 5 #include "content/browser/renderer_host/media/video_capture_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 11 matching lines...) Expand all
22 #include "base/threading/thread_task_runner_handle.h" 22 #include "base/threading/thread_task_runner_handle.h"
23 #include "build/build_config.h" 23 #include "build/build_config.h"
24 #include "content/browser/media/capture/desktop_capture_device_uma_types.h" 24 #include "content/browser/media/capture/desktop_capture_device_uma_types.h"
25 #include "content/browser/media/capture/web_contents_video_capture_device.h" 25 #include "content/browser/media/capture/web_contents_video_capture_device.h"
26 #include "content/browser/media/media_internals.h" 26 #include "content/browser/media/media_internals.h"
27 #include "content/browser/renderer_host/media/video_capture_controller.h" 27 #include "content/browser/renderer_host/media/video_capture_controller.h"
28 #include "content/browser/renderer_host/media/video_capture_controller_event_han dler.h" 28 #include "content/browser/renderer_host/media/video_capture_controller_event_han dler.h"
29 #include "content/public/browser/browser_thread.h" 29 #include "content/public/browser/browser_thread.h"
30 #include "content/public/browser/desktop_media_id.h" 30 #include "content/public/browser/desktop_media_id.h"
31 #include "content/public/common/media_stream_request.h" 31 #include "content/public/common/media_stream_request.h"
32 #include "device/capture/video/video_capture_device.h"
33 #include "device/capture/video/video_capture_device_factory.h"
32 #include "media/base/bind_to_current_loop.h" 34 #include "media/base/bind_to_current_loop.h"
33 #include "media/base/media_switches.h" 35 #include "media/base/media_switches.h"
34 #include "media/capture/video/video_capture_device.h"
35 #include "media/capture/video/video_capture_device_factory.h"
36 36
37 #if defined(ENABLE_SCREEN_CAPTURE) 37 #if defined(ENABLE_SCREEN_CAPTURE)
38 #include "content/browser/media/capture/desktop_capture_device.h" 38 #include "content/browser/media/capture/desktop_capture_device.h"
39 #if defined(USE_AURA) 39 #if defined(USE_AURA)
40 #include "content/browser/media/capture/desktop_capture_device_aura.h" 40 #include "content/browser/media/capture/desktop_capture_device_aura.h"
41 #endif 41 #endif
42 #endif 42 #endif
43 43
44 #if defined(OS_MACOSX) 44 #if defined(OS_MACOSX)
45 #include "media/base/mac/avfoundation_glue.h" 45 #include "media/base/mac/avfoundation_glue.h"
(...skipping 1123 matching lines...) Expand 10 before | Expand all | Expand 10 after
1169 if (!device_in_queue) { 1169 if (!device_in_queue) {
1170 // Session ID is only valid for Screen capture. So we can fake it to 1170 // Session ID is only valid for Screen capture. So we can fake it to
1171 // resume video capture devices here. 1171 // resume video capture devices here.
1172 QueueStartDevice(kFakeSessionId, entry.get(), entry->parameters); 1172 QueueStartDevice(kFakeSessionId, entry.get(), entry->parameters);
1173 } 1173 }
1174 } 1174 }
1175 } 1175 }
1176 #endif // defined(OS_ANDROID) 1176 #endif // defined(OS_ANDROID)
1177 1177
1178 } // namespace content 1178 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698