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

Unified Diff: remoting/host/mouse_cursor_monitor_proxy.cc

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/mouse_cursor_monitor_proxy.h ('k') | remoting/host/mouse_cursor_monitor_proxy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/mouse_cursor_monitor_proxy.cc
diff --git a/remoting/host/mouse_cursor_monitor_proxy.cc b/remoting/host/mouse_cursor_monitor_proxy.cc
index 252eb287ff608790a6254c566957aaeeabe3110a..77d356e073113db669e7001a99c710cc64d5bf34 100644
--- a/remoting/host/mouse_cursor_monitor_proxy.cc
+++ b/remoting/host/mouse_cursor_monitor_proxy.cc
@@ -20,7 +20,7 @@ class MouseCursorMonitorProxy::Core
public:
Core(base::WeakPtr<MouseCursorMonitorProxy> proxy,
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
- scoped_ptr<webrtc::MouseCursorMonitor> mouse_cursor_monitor);
+ std::unique_ptr<webrtc::MouseCursorMonitor> mouse_cursor_monitor);
~Core() override;
void Init(webrtc::MouseCursorMonitor::Mode mode);
@@ -36,7 +36,7 @@ class MouseCursorMonitorProxy::Core
base::WeakPtr<MouseCursorMonitorProxy> proxy_;
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_;
- scoped_ptr<webrtc::MouseCursorMonitor> mouse_cursor_monitor_;
+ std::unique_ptr<webrtc::MouseCursorMonitor> mouse_cursor_monitor_;
DISALLOW_COPY_AND_ASSIGN(Core);
};
@@ -44,7 +44,7 @@ class MouseCursorMonitorProxy::Core
MouseCursorMonitorProxy::Core::Core(
base::WeakPtr<MouseCursorMonitorProxy> proxy,
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
- scoped_ptr<webrtc::MouseCursorMonitor> mouse_cursor_monitor)
+ std::unique_ptr<webrtc::MouseCursorMonitor> mouse_cursor_monitor)
: proxy_(proxy),
caller_task_runner_(caller_task_runner),
mouse_cursor_monitor_(std::move(mouse_cursor_monitor)) {
@@ -71,7 +71,7 @@ void MouseCursorMonitorProxy::Core::Capture() {
void MouseCursorMonitorProxy::Core::OnMouseCursor(webrtc::MouseCursor* cursor) {
DCHECK(thread_checker_.CalledOnValidThread());
- scoped_ptr<webrtc::MouseCursor> owned_cursor(cursor);
+ std::unique_ptr<webrtc::MouseCursor> owned_cursor(cursor);
caller_task_runner_->PostTask(
FROM_HERE, base::Bind(&MouseCursorMonitorProxy::OnMouseCursor, proxy_,
base::Passed(&owned_cursor)));
@@ -89,7 +89,7 @@ void MouseCursorMonitorProxy::Core::OnMouseCursorPosition(
MouseCursorMonitorProxy::MouseCursorMonitorProxy(
scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
- scoped_ptr<webrtc::MouseCursorMonitor> mouse_cursor_monitor)
+ std::unique_ptr<webrtc::MouseCursorMonitor> mouse_cursor_monitor)
: capture_task_runner_(capture_task_runner), weak_factory_(this) {
core_.reset(new Core(weak_factory_.GetWeakPtr(),
base::ThreadTaskRunnerHandle::Get(),
@@ -114,7 +114,7 @@ void MouseCursorMonitorProxy::Capture() {
}
void MouseCursorMonitorProxy::OnMouseCursor(
- scoped_ptr<webrtc::MouseCursor> cursor) {
+ std::unique_ptr<webrtc::MouseCursor> cursor) {
DCHECK(thread_checker_.CalledOnValidThread());
callback_->OnMouseCursor(cursor.release());
}
« no previous file with comments | « remoting/host/mouse_cursor_monitor_proxy.h ('k') | remoting/host/mouse_cursor_monitor_proxy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698