Index: content/renderer/media/video_capture_impl_manager.cc |
diff --git a/content/renderer/media/video_capture_impl_manager.cc b/content/renderer/media/video_capture_impl_manager.cc |
index 5b5de3dc9a4789f94ccde4040ca98a5a3067fff0..46ed2f5c7ec155155ecf0e5d46a946c3fc56579c 100644 |
--- a/content/renderer/media/video_capture_impl_manager.cc |
+++ b/content/renderer/media/video_capture_impl_manager.cc |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
@@ -16,11 +16,6 @@ VideoCaptureImplManager::VideoCaptureImplManager() |
filter_ = new VideoCaptureMessageFilter(); |
} |
-VideoCaptureImplManager::~VideoCaptureImplManager() { |
- STLDeleteContainerPairSecondPointers(devices_.begin(), devices_.end()); |
- thread_.Stop(); |
-} |
- |
media::VideoCapture* VideoCaptureImplManager::AddDevice( |
media::VideoCaptureSessionId id, |
media::VideoCapture::EventHandler* handler) { |
@@ -66,6 +61,11 @@ void VideoCaptureImplManager::FreeDevice(VideoCaptureImpl* vc) { |
delete vc; |
} |
+VideoCaptureImplManager::~VideoCaptureImplManager() { |
+ STLDeleteContainerPairSecondPointers(devices_.begin(), devices_.end()); |
+ thread_.Stop(); |
+} |
+ |
VideoCaptureImplManager::Device::Device( |
VideoCaptureImpl* device, |
media::VideoCapture::EventHandler* handler) |