summaryrefslogtreecommitdiffstats
path: root/media/video
diff options
context:
space:
mode:
authortedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-14 20:39:04 +0000
committertedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-14 20:39:04 +0000
commitfc83b1764f09f01012d7888d186637d476c56a7a (patch)
tree08f5058133766791ce5dbb81faa0a9cd0dbd6468 /media/video
parent911511f983add6d386659ac5576ef3e3a514e588 (diff)
downloadchromium_src-fc83b1764f09f01012d7888d186637d476c56a7a.zip
chromium_src-fc83b1764f09f01012d7888d186637d476c56a7a.tar.gz
chromium_src-fc83b1764f09f01012d7888d186637d476c56a7a.tar.bz2
Convert use of int ms to TimeDelta in files owned by vrk.
R=vrk@chromium.org BUG=108171 TEST= Review URL: http://codereview.chromium.org/9190026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117809 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/video')
-rw-r--r--media/video/capture/fake_video_capture_device.cc4
-rw-r--r--media/video/capture/linux/video_capture_device_linux.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/media/video/capture/fake_video_capture_device.cc b/media/video/capture/fake_video_capture_device.cc
index a74b4d3..7f1f6e5 100644
--- a/media/video/capture/fake_video_capture_device.cc
+++ b/media/video/capture/fake_video_capture_device.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.
@@ -125,7 +125,7 @@ void FakeVideoCaptureDevice::OnCaptureTask() {
FROM_HERE,
base::Bind(&FakeVideoCaptureDevice::OnCaptureTask,
base::Unretained(this)),
- kFakeCaptureTimeoutMs);
+ base::TimeDelta::FromMilliseconds(kFakeCaptureTimeoutMs));
}
} // namespace media
diff --git a/media/video/capture/linux/video_capture_device_linux.cc b/media/video/capture/linux/video_capture_device_linux.cc
index c495cec..6bc1a3a 100644
--- a/media/video/capture/linux/video_capture_device_linux.cc
+++ b/media/video/capture/linux/video_capture_device_linux.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.
@@ -351,7 +351,7 @@ void VideoCaptureDeviceLinux::OnCaptureTask() {
FROM_HERE,
base::Bind(&VideoCaptureDeviceLinux::OnCaptureTask,
base::Unretained(this)),
- kCaptureSelectWaitMs);
+ base::TimeDelta::FromMilliseconds(kCaptureSelectWaitMs));
}
// Check if the driver have filled a buffer.