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

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

Issue 2259753003: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "ui/events/ozone/evdev/input_device_factory_evdev.h" 5 #include "ui/events/ozone/evdev/input_device_factory_evdev.h"
6 6
7 #include <fcntl.h> 7 #include <fcntl.h>
8 #include <linux/input.h> 8 #include <linux/input.h>
9 #include <stddef.h> 9 #include <stddef.h>
10 10
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 86
87 std::unique_ptr<EventConverterEvdev> CreateConverter( 87 std::unique_ptr<EventConverterEvdev> CreateConverter(
88 const OpenInputDeviceParams& params, 88 const OpenInputDeviceParams& params,
89 int fd, 89 int fd,
90 const EventDeviceInfo& devinfo) { 90 const EventDeviceInfo& devinfo) {
91 #if defined(USE_EVDEV_GESTURES) 91 #if defined(USE_EVDEV_GESTURES)
92 // Touchpad or mouse: use gestures library. 92 // Touchpad or mouse: use gestures library.
93 // EventReaderLibevdevCros -> GestureInterpreterLibevdevCros -> DispatchEvent 93 // EventReaderLibevdevCros -> GestureInterpreterLibevdevCros -> DispatchEvent
94 if (devinfo.HasTouchpad() || devinfo.HasMouse()) { 94 if (devinfo.HasTouchpad() || devinfo.HasMouse()) {
95 std::unique_ptr<GestureInterpreterLibevdevCros> gesture_interp = 95 std::unique_ptr<GestureInterpreterLibevdevCros> gesture_interp =
96 base::WrapUnique(new GestureInterpreterLibevdevCros( 96 base::MakeUnique<GestureInterpreterLibevdevCros>(
97 params.id, params.cursor, params.gesture_property_provider, 97 params.id, params.cursor, params.gesture_property_provider,
98 params.dispatcher)); 98 params.dispatcher);
99 return base::WrapUnique(new EventReaderLibevdevCros( 99 return base::MakeUnique<EventReaderLibevdevCros>(
100 fd, params.path, params.id, devinfo, std::move(gesture_interp))); 100 fd, params.path, params.id, devinfo, std::move(gesture_interp));
101 } 101 }
102 #endif 102 #endif
103 103
104 // Touchscreen: use TouchEventConverterEvdev. 104 // Touchscreen: use TouchEventConverterEvdev.
105 if (devinfo.HasTouchscreen()) { 105 if (devinfo.HasTouchscreen()) {
106 std::unique_ptr<TouchEventConverterEvdev> converter( 106 std::unique_ptr<TouchEventConverterEvdev> converter(
107 new TouchEventConverterEvdev(fd, params.path, params.id, devinfo, 107 new TouchEventConverterEvdev(fd, params.path, params.id, devinfo,
108 params.dispatcher)); 108 params.dispatcher));
109 converter->Initialize(devinfo); 109 converter->Initialize(devinfo);
110 return std::move(converter); 110 return std::move(converter);
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 std::vector<int> ids; 485 std::vector<int> ids;
486 gesture_property_provider_->GetDeviceIdsByType(type, &ids); 486 gesture_property_provider_->GetDeviceIdsByType(type, &ids);
487 for (size_t i = 0; i < ids.size(); ++i) { 487 for (size_t i = 0; i < ids.size(); ++i) {
488 SetGestureBoolProperty(gesture_property_provider_.get(), ids[i], name, 488 SetGestureBoolProperty(gesture_property_provider_.get(), ids[i], name,
489 value); 489 value);
490 } 490 }
491 #endif 491 #endif
492 } 492 }
493 493
494 } // namespace ui 494 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/ozone/evdev/event_factory_evdev.cc ('k') | 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