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

Side by Side Diff: ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_EVENTS_OZONE_EVDEV_LIBGESTURES_GLUE_GESTURE_INTERPRETER_LIBEVDEV_CROS _H_ 5 #ifndef UI_EVENTS_OZONE_EVDEV_LIBGESTURES_GLUE_GESTURE_INTERPRETER_LIBEVDEV_CROS _H_
6 #define UI_EVENTS_OZONE_EVDEV_LIBGESTURES_GLUE_GESTURE_INTERPRETER_LIBEVDEV_CROS _H_ 6 #define UI_EVENTS_OZONE_EVDEV_LIBGESTURES_GLUE_GESTURE_INTERPRETER_LIBEVDEV_CROS _H_
7 7
8 #include <gestures/gestures.h> 8 #include <gestures/gestures.h>
9 #include <libevdev/libevdev.h> 9 #include <libevdev/libevdev.h>
10 10
11 #include <bitset> 11 #include <bitset>
12 #include <memory>
12 13
13 #include "base/callback.h" 14 #include "base/callback.h"
14 #include "base/macros.h" 15 #include "base/macros.h"
15 #include "base/memory/scoped_ptr.h"
16 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h" 16 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
17 #include "ui/events/ozone/evdev/event_device_util.h" 17 #include "ui/events/ozone/evdev/event_device_util.h"
18 #include "ui/events/ozone/evdev/event_dispatch_callback.h" 18 #include "ui/events/ozone/evdev/event_dispatch_callback.h"
19 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h" 19 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
20 #include "ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h" 20 #include "ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h"
21 21
22 namespace ui { 22 namespace ui {
23 23
24 class DeviceEventDispatcherEvdev; 24 class DeviceEventDispatcherEvdev;
25 class EventDeviceInfo; 25 class EventDeviceInfo;
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 unsigned long prev_key_state_[EVDEV_BITS_TO_LONGS(KEY_CNT)]; 111 unsigned long prev_key_state_[EVDEV_BITS_TO_LONGS(KEY_CNT)];
112 112
113 // Last mouse button state. 113 // Last mouse button state.
114 static const int kMouseButtonCount = BTN_JOYSTICK - BTN_MOUSE; 114 static const int kMouseButtonCount = BTN_JOYSTICK - BTN_MOUSE;
115 std::bitset<kMouseButtonCount> mouse_button_state_; 115 std::bitset<kMouseButtonCount> mouse_button_state_;
116 116
117 // Device pointer. 117 // Device pointer.
118 Evdev* evdev_ = nullptr; 118 Evdev* evdev_ = nullptr;
119 119
120 // Gesture lib device properties. 120 // Gesture lib device properties.
121 scoped_ptr<GestureDeviceProperties> device_properties_; 121 std::unique_ptr<GestureDeviceProperties> device_properties_;
122 122
123 DISALLOW_COPY_AND_ASSIGN(GestureInterpreterLibevdevCros); 123 DISALLOW_COPY_AND_ASSIGN(GestureInterpreterLibevdevCros);
124 }; 124 };
125 125
126 } // namspace ui 126 } // namspace ui
127 127
128 #endif // UI_EVENTS_OZONE_EVDEV_LIBGESTURES_GLUE_GESTURE_INTERPRETER_LIBEVDEV_C ROS_H_ 128 #endif // UI_EVENTS_OZONE_EVDEV_LIBGESTURES_GLUE_GESTURE_INTERPRETER_LIBEVDEV_C ROS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698