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

Unified Diff: remoting/host/local_input_monitor_chromeos.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/local_input_monitor.h ('k') | remoting/host/local_input_monitor_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/local_input_monitor_chromeos.cc
diff --git a/remoting/host/local_input_monitor_chromeos.cc b/remoting/host/local_input_monitor_chromeos.cc
index 88e0d84e52ee9ac20783ee8094558e5b22db34e9..c2ce05c857651af7591f678975f06854ef623fe7 100644
--- a/remoting/host/local_input_monitor_chromeos.cc
+++ b/remoting/host/local_input_monitor_chromeos.cc
@@ -8,6 +8,7 @@
#include "base/callback.h"
#include "base/location.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/non_thread_safe.h"
#include "remoting/host/chromeos/point_transformer.h"
@@ -56,14 +57,14 @@ class LocalInputMonitorChromeos : public LocalInputMonitor {
// Used to rotate the local mouse positions appropriately based on the
// current display rotation settings.
- scoped_ptr<PointTransformer> point_transformer_;
+ std::unique_ptr<PointTransformer> point_transformer_;
DISALLOW_COPY_AND_ASSIGN(Core);
};
// Task runner on which ui::events are received.
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner_;
- scoped_ptr<Core> core_;
+ std::unique_ptr<Core> core_;
DISALLOW_COPY_AND_ASSIGN(LocalInputMonitorChromeos);
};
@@ -140,12 +141,12 @@ void LocalInputMonitorChromeos::Core::HandleKeyPressed(
} // namespace
-scoped_ptr<LocalInputMonitor> LocalInputMonitor::Create(
+std::unique_ptr<LocalInputMonitor> LocalInputMonitor::Create(
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
base::WeakPtr<ClientSessionControl> client_session_control) {
- return make_scoped_ptr(new LocalInputMonitorChromeos(
+ return base::WrapUnique(new LocalInputMonitorChromeos(
caller_task_runner, input_task_runner, client_session_control));
}
« no previous file with comments | « remoting/host/local_input_monitor.h ('k') | remoting/host/local_input_monitor_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698