From e352dbe6d56d9bbf2eb9c9a1aa30632e236c26b1 Mon Sep 17 00:00:00 2001 From: zijiehe Date: Tue, 21 Feb 2017 15:00:07 -0800 Subject: [PATCH] Update comments in FallbackDesktopCapturerWrapper Update the year in copyright headers from 2016 to 2017, and also rename a variable in FallbackDesktopCapturerWrapperTest to follow coding style. BUG=webrtc:7205 Review-Url: https://codereview.webrtc.org/2706193005 Cr-Commit-Position: refs/heads/master@{#16759} --- .../fallback_desktop_capturer_wrapper.cc | 2 +- .../fallback_desktop_capturer_wrapper.h | 2 +- .../fallback_desktop_capturer_wrapper_unittest.cc | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc b/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc index e8762ada11..f7f91ceecf 100644 --- a/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc +++ b/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source diff --git a/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.h b/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.h index 1ef3b6f7c9..b6436ce715 100644 --- a/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.h +++ b/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source diff --git a/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper_unittest.cc b/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper_unittest.cc index b3bf51b733..106848bb2d 100644 --- a/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper_unittest.cc +++ b/webrtc/modules/desktop_capture/fallback_desktop_capturer_wrapper_unittest.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -80,15 +80,15 @@ class FallbackDesktopCapturerWrapperTest : public testing::Test, // DesktopCapturer::Callback interface void OnCaptureResult(DesktopCapturer::Result result, std::unique_ptr frame) override; - PainterDesktopFrameGenerator frame_generator; + PainterDesktopFrameGenerator frame_generator_; }; FallbackDesktopCapturerWrapperTest::FallbackDesktopCapturerWrapperTest() { - frame_generator.size()->set(1024, 768); + frame_generator_.size()->set(1024, 768); std::unique_ptr main_capturer = - CreateDesktopCapturer(&frame_generator); + CreateDesktopCapturer(&frame_generator_); std::unique_ptr secondary_capturer = - CreateDesktopCapturer(&frame_generator); + CreateDesktopCapturer(&frame_generator_); main_capturer_ = static_cast(main_capturer.get()); secondary_capturer_ = static_cast(secondary_capturer.get());