| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #include "webrtc/modules/desktop_capture/screen_capturer.h" | 11 #include "webrtc/modules/desktop_capture/screen_capturer.h" |
| 12 | 12 |
| 13 #include <utility> |
| 14 |
| 13 #include "webrtc/modules/desktop_capture/desktop_capture_options.h" | 15 #include "webrtc/modules/desktop_capture/desktop_capture_options.h" |
| 14 #include "webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h" | 16 #include "webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h" |
| 15 #include "webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h" | 17 #include "webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h" |
| 16 | 18 |
| 17 namespace webrtc { | 19 namespace webrtc { |
| 18 | 20 |
| 19 // static | 21 // static |
| 20 ScreenCapturer* ScreenCapturer::Create(const DesktopCaptureOptions& options) { | 22 ScreenCapturer* ScreenCapturer::Create(const DesktopCaptureOptions& options) { |
| 21 rtc::scoped_ptr<ScreenCapturer> gdi_capturer( | 23 rtc::scoped_ptr<ScreenCapturer> gdi_capturer( |
| 22 new ScreenCapturerWinGdi(options)); | 24 new ScreenCapturerWinGdi(options)); |
| 23 | 25 |
| 24 if (options.allow_use_magnification_api()) | 26 if (options.allow_use_magnification_api()) |
| 25 return new ScreenCapturerWinMagnifier(gdi_capturer.Pass()); | 27 return new ScreenCapturerWinMagnifier(std::move(gdi_capturer)); |
| 26 | 28 |
| 27 return gdi_capturer.release(); | 29 return gdi_capturer.release(); |
| 28 } | 30 } |
| 29 | 31 |
| 30 } // namespace webrtc | 32 } // namespace webrtc |
| OLD | NEW |