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

Side by Side Diff: device/hid/hid_service.cc

Issue 771393002: Migrate HidServiceLinux and HidConnectionLinux to BrowserThread::UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Switched to an embedded thread checker. Created 6 years 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/lazy_instance.h"
8 #include "base/logging.h" 7 #include "base/logging.h"
9 #include "base/memory/scoped_vector.h"
10 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
11 #include "base/stl_util.h" 9 #include "base/stl_util.h"
12 10
13 #if defined(OS_LINUX) && defined(USE_UDEV) 11 #if defined(OS_LINUX) && defined(USE_UDEV)
14 #include "device/hid/hid_service_linux.h" 12 #include "device/hid/hid_service_linux.h"
15 #elif defined(OS_MACOSX) 13 #elif defined(OS_MACOSX)
16 #include "device/hid/hid_service_mac.h" 14 #include "device/hid/hid_service_mac.h"
17 #else 15 #else
18 #include "device/hid/hid_service_win.h" 16 #include "device/hid/hid_service_win.h"
19 #endif 17 #endif
(...skipping 18 matching lines...) Expand all
38 base::MessageLoop::current()->RemoveDestructionObserver(this); 36 base::MessageLoop::current()->RemoveDestructionObserver(this);
39 delete hid_service_; 37 delete hid_service_;
40 delete this; 38 delete this;
41 g_service = NULL; 39 g_service = NULL;
42 } 40 }
43 41
44 HidService* hid_service_; 42 HidService* hid_service_;
45 }; 43 };
46 44
47 HidService* HidService::GetInstance( 45 HidService* HidService::GetInstance(
48 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner, 46 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) {
49 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
50 if (g_service == NULL) { 47 if (g_service == NULL) {
51 #if defined(OS_LINUX) && defined(USE_UDEV) 48 #if defined(OS_LINUX) && defined(USE_UDEV)
52 g_service = new HidServiceLinux(ui_task_runner); 49 g_service = new HidServiceLinux(file_task_runner);
53 #elif defined(OS_MACOSX) 50 #elif defined(OS_MACOSX)
54 g_service = new HidServiceMac(file_task_runner); 51 g_service = new HidServiceMac(file_task_runner);
55 #elif defined(OS_WIN) 52 #elif defined(OS_WIN)
56 g_service = new HidServiceWin(); 53 g_service = new HidServiceWin();
57 #endif 54 #endif
58 if (g_service != nullptr) { 55 if (g_service != nullptr) {
59 Destroyer* destroyer = new Destroyer(g_service); 56 Destroyer* destroyer = new Destroyer(g_service);
60 base::MessageLoop::current()->AddDestructionObserver(destroyer); 57 base::MessageLoop::current()->AddDestructionObserver(destroyer);
61 } 58 }
62 } 59 }
(...skipping 17 matching lines...) Expand all
80 for (DeviceMap::iterator it = devices_.begin(); 77 for (DeviceMap::iterator it = devices_.begin();
81 it != devices_.end(); 78 it != devices_.end();
82 ++it) { 79 ++it) {
83 devices->push_back(it->second); 80 devices->push_back(it->second);
84 } 81 }
85 } 82 }
86 83
87 // Fills in the device info struct of the given device_id. 84 // Fills in the device info struct of the given device_id.
88 bool HidService::GetDeviceInfo(const HidDeviceId& device_id, 85 bool HidService::GetDeviceInfo(const HidDeviceId& device_id,
89 HidDeviceInfo* info) const { 86 HidDeviceInfo* info) const {
87 DCHECK(thread_checker_.CalledOnValidThread());
90 DeviceMap::const_iterator it = devices_.find(device_id); 88 DeviceMap::const_iterator it = devices_.find(device_id);
91 if (it == devices_.end()) 89 if (it == devices_.end())
92 return false; 90 return false;
93 *info = it->second; 91 *info = it->second;
94 return true; 92 return true;
95 } 93 }
96 94
97 HidService::HidService() { 95 HidService::HidService() {
98 DCHECK(thread_checker_.CalledOnValidThread());
99 } 96 }
100 97
101 void HidService::AddDevice(const HidDeviceInfo& info) { 98 void HidService::AddDevice(const HidDeviceInfo& info) {
102 DCHECK(thread_checker_.CalledOnValidThread()); 99 DCHECK(thread_checker_.CalledOnValidThread());
103 if (!ContainsKey(devices_, info.device_id)) { 100 if (!ContainsKey(devices_, info.device_id)) {
104 devices_[info.device_id] = info; 101 devices_[info.device_id] = info;
105 } 102 }
106 } 103 }
107 104
108 void HidService::RemoveDevice(const HidDeviceId& device_id) { 105 void HidService::RemoveDevice(const HidDeviceId& device_id) {
109 DCHECK(thread_checker_.CalledOnValidThread()); 106 DCHECK(thread_checker_.CalledOnValidThread());
110 DeviceMap::iterator it = devices_.find(device_id); 107 DeviceMap::iterator it = devices_.find(device_id);
111 if (it != devices_.end()) 108 if (it != devices_.end())
112 devices_.erase(it); 109 devices_.erase(it);
113 } 110 }
114 111
115 } // namespace device 112 } // 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