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

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

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_factory_evdev.cc ('k') | ui/events/ozone/evdev/event_thread_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.h
diff --git a/ui/events/ozone/evdev/event_thread_evdev.h b/ui/events/ozone/evdev/event_thread_evdev.h
index a7c90bb572a6ba26287d79d8013cf2b62c44e525..78275620e061b918943538cff01e8a19a27ff1e9 100644
--- a/ui/events/ozone/evdev/event_thread_evdev.h
+++ b/ui/events/ozone/evdev/event_thread_evdev.h
@@ -5,9 +5,10 @@
#ifndef UI_EVENTS_OZONE_EVDEV_EVENT_THREAD_EVDEV_H_
#define UI_EVENTS_OZONE_EVDEV_EVENT_THREAD_EVDEV_H_
+#include <memory>
+
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
namespace base {
class Thread;
@@ -19,7 +20,7 @@ class CursorDelegateEvdev;
class DeviceEventDispatcherEvdev;
class InputDeviceFactoryEvdevProxy;
-typedef base::Callback<void(scoped_ptr<InputDeviceFactoryEvdevProxy>)>
+typedef base::Callback<void(std::unique_ptr<InputDeviceFactoryEvdevProxy>)>
EventThreadStartCallback;
// Wrapper for events thread.
@@ -31,12 +32,12 @@ class EventThreadEvdev {
// Start a new events thread. All device events will get sent to the
// passed dispatcher. The thread will call directly into cursor, so it
// must be synchronized accordingly.
- void Start(scoped_ptr<DeviceEventDispatcherEvdev> dispatcher,
+ void Start(std::unique_ptr<DeviceEventDispatcherEvdev> dispatcher,
CursorDelegateEvdev* cursor,
const EventThreadStartCallback& callback);
private:
- scoped_ptr<base::Thread> thread_;
+ std::unique_ptr<base::Thread> thread_;
DISALLOW_COPY_AND_ASSIGN(EventThreadEvdev);
};
« no previous file with comments | « ui/events/ozone/evdev/event_factory_evdev.cc ('k') | ui/events/ozone/evdev/event_thread_evdev.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698