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

Unified Diff: ui/events/ozone/evdev/event_thread_evdev.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 | « ui/events/ozone/evdev/event_thread_evdev.h ('k') | ui/events/ozone/evdev/input_controller_evdev.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/ozone/evdev/event_thread_evdev.cc
diff --git a/ui/events/ozone/evdev/event_thread_evdev.cc b/ui/events/ozone/evdev/event_thread_evdev.cc
index 7257718fa358bf163a71897be13f1947f7927f54..983ef85160595d37310e196c089517062fc902f9 100644
--- a/ui/events/ozone/evdev/event_thread_evdev.cc
+++ b/ui/events/ozone/evdev/event_thread_evdev.cc
@@ -23,7 +23,7 @@ namespace {
// Internal base::Thread subclass for events thread.
class EvdevThread : public base::Thread {
public:
- EvdevThread(scoped_ptr<DeviceEventDispatcherEvdev> dispatcher,
+ EvdevThread(std::unique_ptr<DeviceEventDispatcherEvdev> dispatcher,
CursorDelegateEvdev* cursor,
const EventThreadStartCallback& callback)
: base::Thread("evdev"),
@@ -38,7 +38,7 @@ class EvdevThread : public base::Thread {
input_device_factory_ =
new InputDeviceFactoryEvdev(std::move(dispatcher_), cursor_);
- scoped_ptr<InputDeviceFactoryEvdevProxy> proxy(
+ std::unique_ptr<InputDeviceFactoryEvdevProxy> proxy(
new InputDeviceFactoryEvdevProxy(base::ThreadTaskRunnerHandle::Get(),
input_device_factory_->GetWeakPtr()));
@@ -53,7 +53,7 @@ class EvdevThread : public base::Thread {
private:
// Initialization bits passed from main thread.
- scoped_ptr<DeviceEventDispatcherEvdev> dispatcher_;
+ std::unique_ptr<DeviceEventDispatcherEvdev> dispatcher_;
CursorDelegateEvdev* cursor_;
EventThreadStartCallback init_callback_;
scoped_refptr<base::SingleThreadTaskRunner> init_runner_;
@@ -70,9 +70,10 @@ EventThreadEvdev::EventThreadEvdev() {
EventThreadEvdev::~EventThreadEvdev() {
}
-void EventThreadEvdev::Start(scoped_ptr<DeviceEventDispatcherEvdev> dispatcher,
- CursorDelegateEvdev* cursor,
- const EventThreadStartCallback& callback) {
+void EventThreadEvdev::Start(
+ std::unique_ptr<DeviceEventDispatcherEvdev> dispatcher,
+ CursorDelegateEvdev* cursor,
+ const EventThreadStartCallback& callback) {
TRACE_EVENT0("evdev", "EventThreadEvdev::Start");
thread_.reset(new EvdevThread(std::move(dispatcher), cursor, callback));
if (!thread_->StartWithOptions(
« no previous file with comments | « ui/events/ozone/evdev/event_thread_evdev.h ('k') | ui/events/ozone/evdev/input_controller_evdev.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698