OLD | NEW |
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 "extensions/shell/browser/shell_device_client.h" | 5 #include "extensions/shell/browser/shell_device_client.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "content/public/browser/browser_thread.h" | 8 #include "content/public/browser/browser_thread.h" |
9 #include "device/hid/hid_service.h" | 9 #include "device/hid/hid_service.h" |
10 #include "device/usb/usb_service.h" | 10 #include "device/usb/usb_service.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 | 22 |
23 if (!usb_service_) { | 23 if (!usb_service_) { |
24 usb_service_ = device::UsbService::Create( | 24 usb_service_ = device::UsbService::Create( |
25 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); | 25 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); |
26 } | 26 } |
27 return usb_service_.get(); | 27 return usb_service_.get(); |
28 } | 28 } |
29 | 29 |
30 device::HidService* ShellDeviceClient::GetHidService() { | 30 device::HidService* ShellDeviceClient::GetHidService() { |
31 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 31 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
32 return device::HidService::GetInstance( | 32 if (!hid_service_) { |
33 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); | 33 hid_service_ = device::HidService::Create( |
| 34 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); |
| 35 } |
| 36 return hid_service_.get(); |
34 } | 37 } |
35 | 38 |
36 } | 39 } |
OLD | NEW |