Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Side by Side Diff: webrtc/modules/desktop_capture/desktop_and_cursor_composer.h

Issue 1923133002: Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Don't remove #include "scoped_ptr.h" from .h files Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
(...skipping 19 matching lines...) Expand all
30 // renders it into the frames generated by |desktop_capturer|. If 30 // renders it into the frames generated by |desktop_capturer|. If
31 // |mouse_monitor| is NULL the frames are passed unmodified. Takes ownership 31 // |mouse_monitor| is NULL the frames are passed unmodified. Takes ownership
32 // of both arguments. 32 // of both arguments.
33 DesktopAndCursorComposer(DesktopCapturer* desktop_capturer, 33 DesktopAndCursorComposer(DesktopCapturer* desktop_capturer,
34 MouseCursorMonitor* mouse_monitor); 34 MouseCursorMonitor* mouse_monitor);
35 virtual ~DesktopAndCursorComposer(); 35 virtual ~DesktopAndCursorComposer();
36 36
37 // DesktopCapturer interface. 37 // DesktopCapturer interface.
38 void Start(DesktopCapturer::Callback* callback) override; 38 void Start(DesktopCapturer::Callback* callback) override;
39 void SetSharedMemoryFactory( 39 void SetSharedMemoryFactory(
40 rtc::scoped_ptr<SharedMemoryFactory> shared_memory_factory) override; 40 std::unique_ptr<SharedMemoryFactory> shared_memory_factory) override;
41 void Capture(const DesktopRegion& region) override; 41 void Capture(const DesktopRegion& region) override;
42 void SetExcludedWindow(WindowId window) override; 42 void SetExcludedWindow(WindowId window) override;
43 43
44 private: 44 private:
45 // DesktopCapturer::Callback interface. 45 // DesktopCapturer::Callback interface.
46 void OnCaptureCompleted(DesktopFrame* frame) override; 46 void OnCaptureCompleted(DesktopFrame* frame) override;
47 47
48 // MouseCursorMonitor::Callback interface. 48 // MouseCursorMonitor::Callback interface.
49 void OnMouseCursor(MouseCursor* cursor) override; 49 void OnMouseCursor(MouseCursor* cursor) override;
50 void OnMouseCursorPosition(MouseCursorMonitor::CursorState state, 50 void OnMouseCursorPosition(MouseCursorMonitor::CursorState state,
51 const DesktopVector& position) override; 51 const DesktopVector& position) override;
52 52
53 std::unique_ptr<DesktopCapturer> desktop_capturer_; 53 std::unique_ptr<DesktopCapturer> desktop_capturer_;
54 std::unique_ptr<MouseCursorMonitor> mouse_monitor_; 54 std::unique_ptr<MouseCursorMonitor> mouse_monitor_;
55 55
56 DesktopCapturer::Callback* callback_; 56 DesktopCapturer::Callback* callback_;
57 57
58 std::unique_ptr<MouseCursor> cursor_; 58 std::unique_ptr<MouseCursor> cursor_;
59 MouseCursorMonitor::CursorState cursor_state_; 59 MouseCursorMonitor::CursorState cursor_state_;
60 DesktopVector cursor_position_; 60 DesktopVector cursor_position_;
61 61
62 RTC_DISALLOW_COPY_AND_ASSIGN(DesktopAndCursorComposer); 62 RTC_DISALLOW_COPY_AND_ASSIGN(DesktopAndCursorComposer);
63 }; 63 };
64 64
65 } // namespace webrtc 65 } // namespace webrtc
66 66
67 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_ 67 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698