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

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

Issue 172003004: Fixit: Move tab and desktop capture code to new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 10 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 | Annotate | Revision Log
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 <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/stl_util.h" 13 #include "base/stl_util.h"
14 #include "base/task_runner_util.h" 14 #include "base/task_runner_util.h"
15 #include "base/threading/sequenced_worker_pool.h" 15 #include "base/threading/sequenced_worker_pool.h"
16 #include "content/browser/media/capture/web_contents_video_capture_device.h"
16 #include "content/browser/renderer_host/media/video_capture_controller.h" 17 #include "content/browser/renderer_host/media/video_capture_controller.h"
17 #include "content/browser/renderer_host/media/video_capture_controller_event_han dler.h" 18 #include "content/browser/renderer_host/media/video_capture_controller_event_han dler.h"
18 #include "content/browser/renderer_host/media/web_contents_video_capture_device. h"
19 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
20 #include "content/public/browser/desktop_media_id.h" 20 #include "content/public/browser/desktop_media_id.h"
21 #include "content/public/common/content_switches.h" 21 #include "content/public/common/content_switches.h"
22 #include "content/public/common/media_stream_request.h" 22 #include "content/public/common/media_stream_request.h"
23 #include "media/base/media_switches.h" 23 #include "media/base/media_switches.h"
24 #include "media/base/scoped_histogram_timer.h" 24 #include "media/base/scoped_histogram_timer.h"
25 #include "media/video/capture/fake_video_capture_device.h" 25 #include "media/video/capture/fake_video_capture_device.h"
26 #include "media/video/capture/file_video_capture_device.h" 26 #include "media/video/capture/file_video_capture_device.h"
27 #include "media/video/capture/video_capture_device.h" 27 #include "media/video/capture/video_capture_device.h"
28 28
29 #if defined(ENABLE_SCREEN_CAPTURE) 29 #if defined(ENABLE_SCREEN_CAPTURE)
30 #include "content/browser/renderer_host/media/desktop_capture_device.h" 30 #include "content/browser/media/capture/desktop_capture_device.h"
31 #if defined(USE_AURA) 31 #if defined(USE_AURA)
32 #include "content/browser/renderer_host/media/desktop_capture_device_aura.h" 32 #include "content/browser/media/capture/desktop_capture_device_aura.h"
33 #endif 33 #endif
34 #endif 34 #endif
35 35
36 namespace content { 36 namespace content {
37 37
38 VideoCaptureManager::DeviceEntry::DeviceEntry( 38 VideoCaptureManager::DeviceEntry::DeviceEntry(
39 MediaStreamType stream_type, 39 MediaStreamType stream_type,
40 const std::string& id, 40 const std::string& id,
41 scoped_ptr<VideoCaptureController> controller) 41 scoped_ptr<VideoCaptureController> controller)
42 : stream_type(stream_type), 42 : stream_type(stream_type),
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 DeviceInfos& device_vector) { 547 DeviceInfos& device_vector) {
548 for (DeviceInfos::iterator it = device_vector.begin(); 548 for (DeviceInfos::iterator it = device_vector.begin();
549 it != device_vector.end(); ++it) { 549 it != device_vector.end(); ++it) {
550 if (it->name.id() == id) 550 if (it->name.id() == id)
551 return &(*it); 551 return &(*it);
552 } 552 }
553 return NULL; 553 return NULL;
554 } 554 }
555 555
556 } // namespace content 556 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698