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

Side by Side Diff: ui/events/ozone/device/device_manager.cc

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 #include "ui/events/ozone/device/device_manager.h" 5 #include "ui/events/ozone/device/device_manager.h"
6 6
7 #include "base/memory/ptr_util.h"
7 #include "base/trace_event/trace_event.h" 8 #include "base/trace_event/trace_event.h"
8 9
9 #if defined(USE_UDEV) 10 #if defined(USE_UDEV)
10 #include "ui/events/ozone/device/udev/device_manager_udev.h" 11 #include "ui/events/ozone/device/udev/device_manager_udev.h"
11 #else 12 #else
12 #include "ui/events/ozone/device/device_manager_manual.h" 13 #include "ui/events/ozone/device/device_manager_manual.h"
13 #endif 14 #endif
14 15
15 namespace ui { 16 namespace ui {
16 17
17 scoped_ptr<DeviceManager> CreateDeviceManager() { 18 std::unique_ptr<DeviceManager> CreateDeviceManager() {
18 TRACE_EVENT0("ozone", "CreateDeviceManager"); 19 TRACE_EVENT0("ozone", "CreateDeviceManager");
19 #if defined(USE_UDEV) 20 #if defined(USE_UDEV)
20 return make_scoped_ptr(new DeviceManagerUdev()); 21 return base::WrapUnique(new DeviceManagerUdev());
21 #else 22 #else
22 return make_scoped_ptr(new DeviceManagerManual()); 23 return base::WrapUnique(new DeviceManagerManual());
23 #endif 24 #endif
24 } 25 }
25 26
26 } // namespace ui 27 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/ozone/device/device_manager.h ('k') | ui/events/ozone/device/udev/device_manager_udev.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698