OLD | NEW |
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 "device/usb/usb_service.h" | 5 #include "device/usb/usb_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/memory/ptr_util.h" |
9 #include "build/build_config.h" | 10 #include "build/build_config.h" |
10 #include "components/device_event_log/device_event_log.h" | 11 #include "components/device_event_log/device_event_log.h" |
11 #include "device/usb/usb_device.h" | 12 #include "device/usb/usb_device.h" |
12 | 13 |
13 #if defined(OS_ANDROID) | 14 #if defined(OS_ANDROID) |
14 #include "device/usb/usb_service_android.h" | 15 #include "device/usb/usb_service_android.h" |
15 #else | 16 #else |
16 #include "device/usb/usb_service_impl.h" | 17 #include "device/usb/usb_service_impl.h" |
17 #endif | 18 #endif |
18 | 19 |
19 namespace device { | 20 namespace device { |
20 | 21 |
21 UsbService::Observer::~Observer() {} | 22 UsbService::Observer::~Observer() {} |
22 | 23 |
23 void UsbService::Observer::OnDeviceAdded(scoped_refptr<UsbDevice> device) { | 24 void UsbService::Observer::OnDeviceAdded(scoped_refptr<UsbDevice> device) { |
24 } | 25 } |
25 | 26 |
26 void UsbService::Observer::OnDeviceRemoved(scoped_refptr<UsbDevice> device) { | 27 void UsbService::Observer::OnDeviceRemoved(scoped_refptr<UsbDevice> device) { |
27 } | 28 } |
28 | 29 |
29 void UsbService::Observer::OnDeviceRemovedCleanup( | 30 void UsbService::Observer::OnDeviceRemovedCleanup( |
30 scoped_refptr<UsbDevice> device) { | 31 scoped_refptr<UsbDevice> device) { |
31 } | 32 } |
32 | 33 |
33 void UsbService::Observer::WillDestroyUsbService() {} | 34 void UsbService::Observer::WillDestroyUsbService() {} |
34 | 35 |
35 // static | 36 // static |
36 scoped_ptr<UsbService> UsbService::Create( | 37 std::unique_ptr<UsbService> UsbService::Create( |
37 scoped_refptr<base::SequencedTaskRunner> blocking_task_runner) { | 38 scoped_refptr<base::SequencedTaskRunner> blocking_task_runner) { |
38 #if defined(OS_ANDROID) | 39 #if defined(OS_ANDROID) |
39 return make_scoped_ptr(new UsbServiceAndroid()); | 40 return base::WrapUnique(new UsbServiceAndroid()); |
40 #else | 41 #else |
41 return make_scoped_ptr(new UsbServiceImpl(blocking_task_runner)); | 42 return base::WrapUnique(new UsbServiceImpl(blocking_task_runner)); |
42 #endif | 43 #endif |
43 } | 44 } |
44 | 45 |
45 UsbService::~UsbService() { | 46 UsbService::~UsbService() { |
46 FOR_EACH_OBSERVER(Observer, observer_list_, WillDestroyUsbService()); | 47 FOR_EACH_OBSERVER(Observer, observer_list_, WillDestroyUsbService()); |
47 } | 48 } |
48 | 49 |
49 UsbService::UsbService() {} | 50 UsbService::UsbService() {} |
50 | 51 |
51 void UsbService::AddObserver(Observer* observer) { | 52 void UsbService::AddObserver(Observer* observer) { |
(...skipping 14 matching lines...) Expand all Loading... |
66 | 67 |
67 void UsbService::NotifyDeviceRemoved(scoped_refptr<UsbDevice> device) { | 68 void UsbService::NotifyDeviceRemoved(scoped_refptr<UsbDevice> device) { |
68 DCHECK(CalledOnValidThread()); | 69 DCHECK(CalledOnValidThread()); |
69 | 70 |
70 FOR_EACH_OBSERVER(Observer, observer_list_, OnDeviceRemoved(device)); | 71 FOR_EACH_OBSERVER(Observer, observer_list_, OnDeviceRemoved(device)); |
71 device->NotifyDeviceRemoved(); | 72 device->NotifyDeviceRemoved(); |
72 FOR_EACH_OBSERVER(Observer, observer_list_, OnDeviceRemovedCleanup(device)); | 73 FOR_EACH_OBSERVER(Observer, observer_list_, OnDeviceRemovedCleanup(device)); |
73 } | 74 } |
74 | 75 |
75 } // namespace device | 76 } // namespace device |
OLD | NEW |