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

Unified Diff: ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.h

Issue 2603863002: Remove base::ScopedPtrHashMap from ozone. (Closed)
Patch Set: fixes Created 4 years 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 | « no previous file | ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.h
diff --git a/ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.h b/ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.h
index d23223dea7daaf7444a7e64fad40a1dd0bee2fff..9ae1956f6d73759faf8bf0f09060375d5f46e359 100644
--- a/ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.h
+++ b/ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.h
@@ -14,9 +14,9 @@
#include <memory>
#include <ostream>
#include <string>
+#include <unordered_map>
#include <vector>
-#include "base/containers/scoped_ptr_hash_map.h"
#include "base/macros.h"
#include "base/memory/scoped_vector.h"
#include "ui/events/ozone/evdev/event_device_info.h"
@@ -112,14 +112,6 @@ class EVENTS_OZONE_EVDEV_EXPORT GesturePropertyProvider {
// Mapping table from a device id to its device pointer.
typedef std::map<DeviceId, DevicePtr> DeviceMap;
- // Mapping table from a device id to its property data.
- // GestureDevicePropertyData contains both properties in use and default
- // properties whose values will be applied upon the device attachment.
- typedef base::ScopedPtrHashMap<
- DeviceId,
- std::unique_ptr<internal::GestureDevicePropertyData>>
- ScopedDeviceDataMap;
-
// Register a device. Setup data-structures and the device's default
// properties.
void RegisterDevice(const DeviceId id, const DevicePtr device);
@@ -166,9 +158,12 @@ class EVENTS_OZONE_EVDEV_EXPORT GesturePropertyProvider {
// Map from device ids to device pointers.
DeviceMap device_map_;
- // GestureDevicePropertyData indexed by their respective device ids. Owns the
- // objects.
- ScopedDeviceDataMap device_data_map_;
+ // Mapping table from a device id to its property data.
+ // GestureDevicePropertyData contains both properties in use and default
+ // properties whose values will be applied upon the device attachment.
+ std::unordered_map<DeviceId,
+ std::unique_ptr<internal::GestureDevicePropertyData>>
+ device_data_map_;
// A vector of parsed sections in configuration files. Owns MatchCriterias,
// GesturesProps and ConfigurationSections in it.
« no previous file with comments | « no previous file | ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698