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

Side by Side Diff: device/hid/hid_service.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/hid/hid_service.h ('k') | device/hid/hid_service_linux.h » ('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/hid/hid_service.h" 5 #include "device/hid/hid_service.h"
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ptr_util.h"
10 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
11 #include "base/stl_util.h" 12 #include "base/stl_util.h"
12 #include "build/build_config.h" 13 #include "build/build_config.h"
13 #include "components/device_event_log/device_event_log.h" 14 #include "components/device_event_log/device_event_log.h"
14 15
15 #if defined(OS_LINUX) && defined(USE_UDEV) 16 #if defined(OS_LINUX) && defined(USE_UDEV)
16 #include "device/hid/hid_service_linux.h" 17 #include "device/hid/hid_service_linux.h"
17 #elif defined(OS_MACOSX) 18 #elif defined(OS_MACOSX)
18 #include "device/hid/hid_service_mac.h" 19 #include "device/hid/hid_service_mac.h"
19 #elif defined(OS_WIN) 20 #elif defined(OS_WIN)
20 #include "device/hid/hid_service_win.h" 21 #include "device/hid/hid_service_win.h"
21 #endif 22 #endif
22 23
23 namespace device { 24 namespace device {
24 25
25 void HidService::Observer::OnDeviceAdded( 26 void HidService::Observer::OnDeviceAdded(
26 scoped_refptr<HidDeviceInfo> device_info) { 27 scoped_refptr<HidDeviceInfo> device_info) {
27 } 28 }
28 29
29 void HidService::Observer::OnDeviceRemoved( 30 void HidService::Observer::OnDeviceRemoved(
30 scoped_refptr<HidDeviceInfo> device_info) { 31 scoped_refptr<HidDeviceInfo> device_info) {
31 } 32 }
32 33
33 void HidService::Observer::OnDeviceRemovedCleanup( 34 void HidService::Observer::OnDeviceRemovedCleanup(
34 scoped_refptr<HidDeviceInfo> device_info) { 35 scoped_refptr<HidDeviceInfo> device_info) {
35 } 36 }
36 37
37 scoped_ptr<HidService> HidService::Create( 38 std::unique_ptr<HidService> HidService::Create(
38 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) { 39 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) {
39 #if defined(OS_LINUX) && defined(USE_UDEV) 40 #if defined(OS_LINUX) && defined(USE_UDEV)
40 return make_scoped_ptr(new HidServiceLinux(file_task_runner)); 41 return base::WrapUnique(new HidServiceLinux(file_task_runner));
41 #elif defined(OS_MACOSX) 42 #elif defined(OS_MACOSX)
42 return make_scoped_ptr(new HidServiceMac(file_task_runner)); 43 return base::WrapUnique(new HidServiceMac(file_task_runner));
43 #elif defined(OS_WIN) 44 #elif defined(OS_WIN)
44 return make_scoped_ptr(new HidServiceWin(file_task_runner)); 45 return base::WrapUnique(new HidServiceWin(file_task_runner));
45 #else 46 #else
46 return nullptr; 47 return nullptr;
47 #endif 48 #endif
48 } 49 }
49 50
50 void HidService::GetDevices(const GetDevicesCallback& callback) { 51 void HidService::GetDevices(const GetDevicesCallback& callback) {
51 DCHECK(thread_checker_.CalledOnValidThread()); 52 DCHECK(thread_checker_.CalledOnValidThread());
52 if (enumeration_ready_) { 53 if (enumeration_ready_) {
53 std::vector<scoped_refptr<HidDeviceInfo>> devices; 54 std::vector<scoped_refptr<HidDeviceInfo>> devices;
54 for (const auto& map_entry : devices_) { 55 for (const auto& map_entry : devices_) {
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 } 135 }
135 136
136 for (const GetDevicesCallback& callback : pending_enumerations_) { 137 for (const GetDevicesCallback& callback : pending_enumerations_) {
137 callback.Run(devices); 138 callback.Run(devices);
138 } 139 }
139 pending_enumerations_.clear(); 140 pending_enumerations_.clear();
140 } 141 }
141 } 142 }
142 143
143 } // namespace device 144 } // namespace device
OLDNEW
« no previous file with comments | « device/hid/hid_service.h ('k') | device/hid/hid_service_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698