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

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

Issue 922923002: ui: Cleanup the usage of scoped_ptr throughout. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE Created 5 years, 10 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
« no previous file with comments | « ui/events/event.cc ('k') | ui/events/platform/x11/x11_event_source_glib.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #if defined(USE_UDEV) 7 #if defined(USE_UDEV)
8 #include "ui/events/ozone/device/udev/device_manager_udev.h" 8 #include "ui/events/ozone/device/udev/device_manager_udev.h"
9 #else 9 #else
10 #include "ui/events/ozone/device/device_manager_manual.h" 10 #include "ui/events/ozone/device/device_manager_manual.h"
11 #endif 11 #endif
12 12
13 namespace ui { 13 namespace ui {
14 14
15 scoped_ptr<DeviceManager> CreateDeviceManager() { 15 scoped_ptr<DeviceManager> CreateDeviceManager() {
16 #if defined(USE_UDEV) 16 #if defined(USE_UDEV)
17 return scoped_ptr<DeviceManager>(new DeviceManagerUdev()); 17 return make_scoped_ptr(new DeviceManagerUdev());
18 #else 18 #else
19 return scoped_ptr<DeviceManager>(new DeviceManagerManual()); 19 return make_scoped_ptr(new DeviceManagerManual());
20 #endif 20 #endif
21 } 21 }
22 22
23 } // namespace ui 23 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/event.cc ('k') | ui/events/platform/x11/x11_event_source_glib.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698