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

Side by Side Diff: ui/events/ozone/evdev/input_device_factory_evdev.h

Issue 2474163003: Remove stl_util's deletion function use from ui/. (Closed)
Patch Set: fix Created 4 years, 1 month 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_INPUT_DEVICE_FACTORY_EVDEV_H_ 5 #ifndef UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_EVDEV_H_
6 #define UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_EVDEV_H_ 6 #define UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_EVDEV_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <set> 10 #include <set>
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 void NotifyTouchpadDevicesUpdated(); 93 void NotifyTouchpadDevicesUpdated();
94 94
95 void SetIntPropertyForOneType(const EventDeviceType type, 95 void SetIntPropertyForOneType(const EventDeviceType type,
96 const std::string& name, 96 const std::string& name,
97 int value); 97 int value);
98 void SetBoolPropertyForOneType(const EventDeviceType type, 98 void SetBoolPropertyForOneType(const EventDeviceType type,
99 const std::string& name, 99 const std::string& name,
100 bool value); 100 bool value);
101 101
102 // Owned per-device event converters (by path). 102 // Owned per-device event converters (by path).
103 std::map<base::FilePath, EventConverterEvdev*> converters_; 103 std::map<base::FilePath, std::unique_ptr<EventConverterEvdev>> converters_;
104 104
105 // Task runner for our thread. 105 // Task runner for our thread.
106 scoped_refptr<base::TaskRunner> task_runner_; 106 scoped_refptr<base::TaskRunner> task_runner_;
107 107
108 // Cursor movement. 108 // Cursor movement.
109 CursorDelegateEvdev* cursor_; 109 CursorDelegateEvdev* cursor_;
110 110
111 #if defined(USE_EVDEV_GESTURES) 111 #if defined(USE_EVDEV_GESTURES)
112 // Gesture library property provider (used by touchpads/mice). 112 // Gesture library property provider (used by touchpads/mice).
113 std::unique_ptr<GesturePropertyProvider> gesture_property_provider_; 113 std::unique_ptr<GesturePropertyProvider> gesture_property_provider_;
(...skipping 26 matching lines...) Expand all
140 140
141 // Support weak pointers for attach & detach callbacks. 141 // Support weak pointers for attach & detach callbacks.
142 base::WeakPtrFactory<InputDeviceFactoryEvdev> weak_ptr_factory_; 142 base::WeakPtrFactory<InputDeviceFactoryEvdev> weak_ptr_factory_;
143 143
144 DISALLOW_COPY_AND_ASSIGN(InputDeviceFactoryEvdev); 144 DISALLOW_COPY_AND_ASSIGN(InputDeviceFactoryEvdev);
145 }; 145 };
146 146
147 } // namespace ui 147 } // namespace ui
148 148
149 #endif // UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_EVDEV_H_ 149 #endif // UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_EVDEV_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698