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

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

Issue 1017503002: VideoCaptureHost/VideoCaptureControllerEventHandler cleanup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unneeded BindToCurrentLoop() Created 5 years, 9 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 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 VideoCaptureManager::CaptureDeviceStartRequest::CaptureDeviceStartRequest( 145 VideoCaptureManager::CaptureDeviceStartRequest::CaptureDeviceStartRequest(
146 int serial_id, 146 int serial_id,
147 media::VideoCaptureSessionId session_id, 147 media::VideoCaptureSessionId session_id,
148 const media::VideoCaptureParams& params) 148 const media::VideoCaptureParams& params)
149 : serial_id_(serial_id), 149 : serial_id_(serial_id),
150 session_id_(session_id), 150 session_id_(session_id),
151 params_(params), 151 params_(params),
152 abort_start_(false) { 152 abort_start_(false) {
153 } 153 }
154 154
155
156 VideoCaptureManager::VideoCaptureManager( 155 VideoCaptureManager::VideoCaptureManager(
157 scoped_ptr<media::VideoCaptureDeviceFactory> factory) 156 scoped_ptr<media::VideoCaptureDeviceFactory> factory)
158 : listener_(NULL), 157 : listener_(NULL),
159 new_capture_session_id_(1), 158 new_capture_session_id_(1),
160 video_capture_device_factory_(factory.Pass()) { 159 video_capture_device_factory_(factory.Pass()) {
161 } 160 }
162 161
163 VideoCaptureManager::~VideoCaptureManager() { 162 VideoCaptureManager::~VideoCaptureManager() {
164 DCHECK(devices_.empty()); 163 DCHECK(devices_.empty());
165 DCHECK(device_start_queue_.empty()); 164 DCHECK(device_start_queue_.empty());
(...skipping 692 matching lines...) Expand 10 before | Expand all | Expand 10 after
858 DCHECK(IsOnDeviceThread()); 857 DCHECK(IsOnDeviceThread());
859 #if defined(ENABLE_SCREEN_CAPTURE) 858 #if defined(ENABLE_SCREEN_CAPTURE)
860 DesktopCaptureDevice* desktop_device = 859 DesktopCaptureDevice* desktop_device =
861 static_cast<DesktopCaptureDevice*>(device); 860 static_cast<DesktopCaptureDevice*>(device);
862 desktop_device->SetNotificationWindowId(window_id); 861 desktop_device->SetNotificationWindowId(window_id);
863 VLOG(2) << "Screen capture notification window passed on device thread."; 862 VLOG(2) << "Screen capture notification window passed on device thread.";
864 #endif 863 #endif
865 } 864 }
866 865
867 } // namespace content 866 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698