summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-01 18:47:31 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-01 18:47:31 +0000
commit5222ad38b0273a1272a2e2a84121f76a3dd19031 (patch)
treed697aad81fd03ff77d247e148ada71b354734d1a /media
parenta209a09633a22ec7006a1b1e88fbc7e69029d2c0 (diff)
downloadchromium_src-5222ad38b0273a1272a2e2a84121f76a3dd19031.zip
chromium_src-5222ad38b0273a1272a2e2a84121f76a3dd19031.tar.gz
chromium_src-5222ad38b0273a1272a2e2a84121f76a3dd19031.tar.bz2
Update copyright header for files added in r180025
Files added in r180025 had incorrect year in the copyright notice. Also made two minor comments changes in the new files. BUG=134249 TBR=wez@chromium.org Review URL: https://codereview.chromium.org/12160002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/video/capture/screen/screen_capture_device.cc3
-rw-r--r--media/video/capture/screen/screen_capture_device.h2
-rw-r--r--media/video/capture/screen/screen_capture_device_unittest.cc4
3 files changed, 5 insertions, 4 deletions
diff --git a/media/video/capture/screen/screen_capture_device.cc b/media/video/capture/screen/screen_capture_device.cc
index 0d168c5..4caf17b 100644
--- a/media/video/capture/screen/screen_capture_device.cc
+++ b/media/video/capture/screen/screen_capture_device.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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.
@@ -31,6 +31,7 @@ class ScreenCaptureDevice::Core
screen_capturer_ = capturer.Pass();
}
+ // Implementation of VideoCaptureDevice methods.
void Allocate(int width, int height,
int frame_rate,
EventHandler* event_handler);
diff --git a/media/video/capture/screen/screen_capture_device.h b/media/video/capture/screen/screen_capture_device.h
index 3b7aa5e..f1cee98 100644
--- a/media/video/capture/screen/screen_capture_device.h
+++ b/media/video/capture/screen/screen_capture_device.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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.
diff --git a/media/video/capture/screen/screen_capture_device_unittest.cc b/media/video/capture/screen/screen_capture_device_unittest.cc
index d28e8c9..f14789f 100644
--- a/media/video/capture/screen/screen_capture_device_unittest.cc
+++ b/media/video/capture/screen/screen_capture_device_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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.
@@ -123,7 +123,7 @@ TEST_F(ScreenCaptureDeviceTest, Capture) {
EXPECT_EQ(caps.width * caps.height * 4, frame_size);
}
-// Test that screen capturer can handle resolution change.
+// Test that screen capturer can handle resolution change without crashing.
TEST_F(ScreenCaptureDeviceTest, ScreenResolutionChange) {
FakeScreenCapturer* mock_capturer = new FakeScreenCapturer();