| 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 "content/public/browser/browser_thread.h" | 7 #include "content/public/browser/browser_thread.h" |
| 8 #include "device/hid/hid_service.h" | 8 #include "device/hid/hid_service.h" |
| 9 #include "device/usb/usb_service.h" | 9 #include "device/usb/usb_service.h" |
| 10 | 10 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 usb_service_->Shutdown(); | 25 usb_service_->Shutdown(); |
| 26 if (hid_service_) | 26 if (hid_service_) |
| 27 hid_service_->Shutdown(); | 27 hid_service_->Shutdown(); |
| 28 #if DCHECK_IS_ON() | 28 #if DCHECK_IS_ON() |
| 29 did_shutdown_ = true; | 29 did_shutdown_ = true; |
| 30 #endif | 30 #endif |
| 31 } | 31 } |
| 32 | 32 |
| 33 device::UsbService* ShellDeviceClient::GetUsbService() { | 33 device::UsbService* ShellDeviceClient::GetUsbService() { |
| 34 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 34 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 35 | 35 if (!usb_service_) |
| 36 if (!usb_service_) { | 36 usb_service_ = device::UsbService::Create(); |
| 37 usb_service_ = device::UsbService::Create( | |
| 38 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE)); | |
| 39 } | |
| 40 return usb_service_.get(); | 37 return usb_service_.get(); |
| 41 } | 38 } |
| 42 | 39 |
| 43 device::HidService* ShellDeviceClient::GetHidService() { | 40 device::HidService* ShellDeviceClient::GetHidService() { |
| 44 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 41 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 45 if (!hid_service_) | 42 if (!hid_service_) |
| 46 hid_service_ = device::HidService::Create(); | 43 hid_service_ = device::HidService::Create(); |
| 47 return hid_service_.get(); | 44 return hid_service_.get(); |
| 48 } | 45 } |
| 49 | 46 |
| 50 } // namespace extensions | 47 } // namespace extensions |
| OLD | NEW |