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

Unified Diff: ui/events/ozone/evdev/event_factory_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_converter_test_util.cc ('k') | ui/events/ozone/evdev/event_factory_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_factory_evdev.h
diff --git a/ui/events/ozone/evdev/event_factory_evdev.h b/ui/events/ozone/evdev/event_factory_evdev.h
index c4d68c639fb696683dcf5dae526a40553369c426..c7faea9af14ec57e6db235ae4563a7021623ccd7 100644
--- a/ui/events/ozone/evdev/event_factory_evdev.h
+++ b/ui/events/ozone/evdev/event_factory_evdev.h
@@ -59,7 +59,7 @@ class EVENTS_OZONE_EVDEV_EXPORT EventFactoryEvdev : public DeviceEventObserver,
void WarpCursorTo(gfx::AcceleratedWidget widget,
const gfx::PointF& location);
- scoped_ptr<SystemInputInjector> CreateSystemInputInjector();
+ std::unique_ptr<SystemInputInjector> CreateSystemInputInjector();
InputControllerEvdev* input_controller() { return &input_controller_; }
@@ -99,7 +99,7 @@ class EVENTS_OZONE_EVDEV_EXPORT EventFactoryEvdev : public DeviceEventObserver,
// Device thread initialization.
void StartThread();
void OnThreadStarted(
- scoped_ptr<InputDeviceFactoryEvdevProxy> input_device_factory);
+ std::unique_ptr<InputDeviceFactoryEvdevProxy> input_device_factory);
// Used to uniquely identify input devices.
int last_device_id_ = 0;
@@ -109,7 +109,7 @@ class EVENTS_OZONE_EVDEV_EXPORT EventFactoryEvdev : public DeviceEventObserver,
// Proxy for input device factory (manages device I/O objects).
// The real object lives on a different thread.
- scoped_ptr<InputDeviceFactoryEvdevProxy> input_device_factory_proxy_;
+ std::unique_ptr<InputDeviceFactoryEvdevProxy> input_device_factory_proxy_;
// Modifier key state (shift, ctrl, etc).
EventModifiersEvdev modifiers_;
« no previous file with comments | « ui/events/ozone/evdev/event_converter_test_util.cc ('k') | ui/events/ozone/evdev/event_factory_evdev.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698