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

Side by Side Diff: device/udev_linux/udev_loader.cc

Issue 1874313002: Convert device to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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
« no previous file with comments | « device/udev_linux/udev_linux.h ('k') | device/usb/mojo/device_impl.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 "device/udev_linux/udev_loader.h" 5 #include "device/udev_linux/udev_loader.h"
6 6
7 #include <memory>
8
7 #include "base/logging.h" 9 #include "base/logging.h"
8 #include "device/udev_linux/udev0_loader.h" 10 #include "device/udev_linux/udev0_loader.h"
9 #include "device/udev_linux/udev1_loader.h" 11 #include "device/udev_linux/udev1_loader.h"
10 12
11 namespace device { 13 namespace device {
12 14
13 namespace { 15 namespace {
14 16
15 UdevLoader* g_udev_loader = NULL; 17 UdevLoader* g_udev_loader = NULL;
16 18
17 } // namespace 19 } // namespace
18 20
19 // static 21 // static
20 UdevLoader* UdevLoader::Get() { 22 UdevLoader* UdevLoader::Get() {
21 if (g_udev_loader) 23 if (g_udev_loader)
22 return g_udev_loader; 24 return g_udev_loader;
23 25
24 scoped_ptr<UdevLoader> udev_loader; 26 std::unique_ptr<UdevLoader> udev_loader;
25 udev_loader.reset(new Udev1Loader); 27 udev_loader.reset(new Udev1Loader);
26 if (udev_loader->Init()) { 28 if (udev_loader->Init()) {
27 g_udev_loader = udev_loader.release(); 29 g_udev_loader = udev_loader.release();
28 return g_udev_loader; 30 return g_udev_loader;
29 } 31 }
30 32
31 udev_loader.reset(new Udev0Loader); 33 udev_loader.reset(new Udev0Loader);
32 if (udev_loader->Init()) { 34 if (udev_loader->Init()) {
33 g_udev_loader = udev_loader.release(); 35 g_udev_loader = udev_loader.release();
34 return g_udev_loader; 36 return g_udev_loader;
35 } 37 }
36 CHECK(false); 38 CHECK(false);
37 return NULL; 39 return NULL;
38 } 40 }
39 41
40 UdevLoader::~UdevLoader() { 42 UdevLoader::~UdevLoader() {
41 } 43 }
42 44
43 } // namespace device 45 } // namespace device
OLDNEW
« no previous file with comments | « device/udev_linux/udev_linux.h ('k') | device/usb/mojo/device_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698