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

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

Issue 1743203002: Replace scoped_ptr with unique_ptr in webrtc/modules/desktop_capture/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: More Windows reverts Created 4 years, 9 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
11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_ 11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_
12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_ 12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_
13 13
14 #include <memory>
15
14 #include "webrtc/base/scoped_ptr.h" 16 #include "webrtc/base/scoped_ptr.h"
15 #include "webrtc/modules/desktop_capture/desktop_capturer.h" 17 #include "webrtc/modules/desktop_capture/desktop_capturer.h"
16 #include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h" 18 #include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h"
17 19
18 namespace webrtc { 20 namespace webrtc {
19 21
20 // A wrapper for DesktopCapturer that also captures mouse using specified 22 // A wrapper for DesktopCapturer that also captures mouse using specified
21 // MouseCursorMonitor and renders it on the generated streams. 23 // MouseCursorMonitor and renders it on the generated streams.
22 class DesktopAndCursorComposer : public DesktopCapturer, 24 class DesktopAndCursorComposer : public DesktopCapturer,
23 public DesktopCapturer::Callback, 25 public DesktopCapturer::Callback,
(...skipping 16 matching lines...) Expand all
40 42
41 private: 43 private:
42 // DesktopCapturer::Callback interface. 44 // DesktopCapturer::Callback interface.
43 void OnCaptureCompleted(DesktopFrame* frame) override; 45 void OnCaptureCompleted(DesktopFrame* frame) override;
44 46
45 // MouseCursorMonitor::Callback interface. 47 // MouseCursorMonitor::Callback interface.
46 void OnMouseCursor(MouseCursor* cursor) override; 48 void OnMouseCursor(MouseCursor* cursor) override;
47 void OnMouseCursorPosition(MouseCursorMonitor::CursorState state, 49 void OnMouseCursorPosition(MouseCursorMonitor::CursorState state,
48 const DesktopVector& position) override; 50 const DesktopVector& position) override;
49 51
50 rtc::scoped_ptr<DesktopCapturer> desktop_capturer_; 52 std::unique_ptr<DesktopCapturer> desktop_capturer_;
51 rtc::scoped_ptr<MouseCursorMonitor> mouse_monitor_; 53 std::unique_ptr<MouseCursorMonitor> mouse_monitor_;
52 54
53 DesktopCapturer::Callback* callback_; 55 DesktopCapturer::Callback* callback_;
54 56
55 rtc::scoped_ptr<MouseCursor> cursor_; 57 std::unique_ptr<MouseCursor> cursor_;
56 MouseCursorMonitor::CursorState cursor_state_; 58 MouseCursorMonitor::CursorState cursor_state_;
57 DesktopVector cursor_position_; 59 DesktopVector cursor_position_;
58 60
59 RTC_DISALLOW_COPY_AND_ASSIGN(DesktopAndCursorComposer); 61 RTC_DISALLOW_COPY_AND_ASSIGN(DesktopAndCursorComposer);
60 }; 62 };
61 63
62 } // namespace webrtc 64 } // namespace webrtc
63 65
64 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_ 66 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698