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

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

Issue 1942823002: Remove webrtc/base/scoped_ptr.h (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: fix additional scoped_ptr uses that had been added 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
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> 14 #include <memory>
15 15
16 #include "webrtc/base/constructormagic.h" 16 #include "webrtc/base/constructormagic.h"
17 #include "webrtc/base/scoped_ptr.h"
18 #include "webrtc/modules/desktop_capture/desktop_capturer.h" 17 #include "webrtc/modules/desktop_capture/desktop_capturer.h"
19 #include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h" 18 #include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h"
20 19
21 namespace webrtc { 20 namespace webrtc {
22 21
23 // A wrapper for DesktopCapturer that also captures mouse using specified 22 // A wrapper for DesktopCapturer that also captures mouse using specified
24 // MouseCursorMonitor and renders it on the generated streams. 23 // MouseCursorMonitor and renders it on the generated streams.
25 class DesktopAndCursorComposer : public DesktopCapturer, 24 class DesktopAndCursorComposer : public DesktopCapturer,
26 public DesktopCapturer::Callback, 25 public DesktopCapturer::Callback,
27 public MouseCursorMonitor::Callback { 26 public MouseCursorMonitor::Callback {
(...skipping 30 matching lines...) Expand all
58 std::unique_ptr<MouseCursor> cursor_; 57 std::unique_ptr<MouseCursor> cursor_;
59 MouseCursorMonitor::CursorState cursor_state_; 58 MouseCursorMonitor::CursorState cursor_state_;
60 DesktopVector cursor_position_; 59 DesktopVector cursor_position_;
61 60
62 RTC_DISALLOW_COPY_AND_ASSIGN(DesktopAndCursorComposer); 61 RTC_DISALLOW_COPY_AND_ASSIGN(DesktopAndCursorComposer);
63 }; 62 };
64 63
65 } // namespace webrtc 64 } // namespace webrtc
66 65
67 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_ 66 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/cropping_window_capturer.h ('k') | webrtc/modules/desktop_capture/desktop_capturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698