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

Side by Side Diff: device/usb/usb_service.cc

Issue 1314273002: Manage UsbService lifetime in DeviceClient implementations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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/usb/usb_service.h ('k') | device/usb/usb_service_impl.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 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 "components/device_event_log/device_event_log.h" 9 #include "components/device_event_log/device_event_log.h"
10 #include "device/usb/usb_device.h" 10 #include "device/usb/usb_device.h"
11 #include "device/usb/usb_service_impl.h" 11 #include "device/usb/usb_service_impl.h"
12 12
13 namespace device { 13 namespace device {
14 14
15 namespace {
16
17 UsbService* g_service;
18
19 } // namespace
20
21 UsbService::Observer::~Observer() {} 15 UsbService::Observer::~Observer() {}
22 16
23 void UsbService::Observer::OnDeviceAdded(scoped_refptr<UsbDevice> device) { 17 void UsbService::Observer::OnDeviceAdded(scoped_refptr<UsbDevice> device) {
24 } 18 }
25 19
26 void UsbService::Observer::OnDeviceRemoved(scoped_refptr<UsbDevice> device) { 20 void UsbService::Observer::OnDeviceRemoved(scoped_refptr<UsbDevice> device) {
27 } 21 }
28 22
29 void UsbService::Observer::OnDeviceRemovedCleanup( 23 void UsbService::Observer::OnDeviceRemovedCleanup(
30 scoped_refptr<UsbDevice> device) { 24 scoped_refptr<UsbDevice> device) {
31 } 25 }
32 26
33 // static 27 // static
34 UsbService* UsbService::GetInstance( 28 scoped_ptr<UsbService> UsbService::Create(
35 scoped_refptr<base::SequencedTaskRunner> blocking_task_runner) { 29 scoped_refptr<base::SequencedTaskRunner> blocking_task_runner) {
36 if (!g_service) { 30 return make_scoped_ptr(new UsbServiceImpl(blocking_task_runner));
37 // |g_service| is set by the UsbService constructor.
38 new UsbServiceImpl(blocking_task_runner);
39 if (!g_service) {
40 base::AtExitManager::RegisterTask(base::Bind(
41 &base::DeletePointer<UsbService>, base::Unretained(g_service)));
42 }
43 }
44 return g_service;
45 } 31 }
46 32
47 UsbService::UsbService() { 33 UsbService::~UsbService() {}
48 DCHECK(!g_service);
49 g_service = this;
50 }
51 34
52 UsbService::~UsbService() { 35 UsbService::UsbService() {}
53 DCHECK(g_service);
54 g_service = nullptr;
55 }
56 36
57 void UsbService::AddObserver(Observer* observer) { 37 void UsbService::AddObserver(Observer* observer) {
58 DCHECK(CalledOnValidThread()); 38 DCHECK(CalledOnValidThread());
59 observer_list_.AddObserver(observer); 39 observer_list_.AddObserver(observer);
60 } 40 }
61 41
62 void UsbService::RemoveObserver(Observer* observer) { 42 void UsbService::RemoveObserver(Observer* observer) {
63 DCHECK(CalledOnValidThread()); 43 DCHECK(CalledOnValidThread());
64 observer_list_.RemoveObserver(observer); 44 observer_list_.RemoveObserver(observer);
65 } 45 }
66 46
67 void UsbService::NotifyDeviceAdded(scoped_refptr<UsbDevice> device) { 47 void UsbService::NotifyDeviceAdded(scoped_refptr<UsbDevice> device) {
68 DCHECK(CalledOnValidThread()); 48 DCHECK(CalledOnValidThread());
69 49
70 FOR_EACH_OBSERVER(Observer, observer_list_, OnDeviceAdded(device)); 50 FOR_EACH_OBSERVER(Observer, observer_list_, OnDeviceAdded(device));
71 } 51 }
72 52
73 void UsbService::NotifyDeviceRemoved(scoped_refptr<UsbDevice> device) { 53 void UsbService::NotifyDeviceRemoved(scoped_refptr<UsbDevice> device) {
74 DCHECK(CalledOnValidThread()); 54 DCHECK(CalledOnValidThread());
75 55
76 FOR_EACH_OBSERVER(Observer, observer_list_, OnDeviceRemoved(device)); 56 FOR_EACH_OBSERVER(Observer, observer_list_, OnDeviceRemoved(device));
77 FOR_EACH_OBSERVER(Observer, observer_list_, OnDeviceRemovedCleanup(device)); 57 FOR_EACH_OBSERVER(Observer, observer_list_, OnDeviceRemovedCleanup(device));
78 } 58 }
79 59
80 } // namespace device 60 } // namespace device
OLDNEW
« no previous file with comments | « device/usb/usb_service.h ('k') | device/usb/usb_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698