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

Side by Side Diff: chrome/browser/chrome_device_client.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
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 "chrome/browser/chrome_device_client.h" 5 #include "chrome/browser/chrome_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"
11 11
12 using content::BrowserThread; 12 using content::BrowserThread;
13 13
14 ChromeDeviceClient::ChromeDeviceClient() {} 14 ChromeDeviceClient::ChromeDeviceClient() {}
15 15
16 ChromeDeviceClient::~ChromeDeviceClient() {} 16 ChromeDeviceClient::~ChromeDeviceClient() {}
17 17
18 device::UsbService* ChromeDeviceClient::GetUsbService() { 18 device::UsbService* ChromeDeviceClient::GetUsbService() {
19 DCHECK_CURRENTLY_ON(BrowserThread::UI); 19 DCHECK_CURRENTLY_ON(BrowserThread::UI);
20 return device::UsbService::GetInstance( 20 if (!usb_service_) {
21 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); 21 usb_service_ = device::UsbService::Create(
22 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
23 }
24 return usb_service_.get();
22 } 25 }
23 26
24 device::HidService* ChromeDeviceClient::GetHidService() { 27 device::HidService* ChromeDeviceClient::GetHidService() {
25 DCHECK_CURRENTLY_ON(BrowserThread::UI); 28 DCHECK_CURRENTLY_ON(BrowserThread::UI);
26 return device::HidService::GetInstance( 29 return device::HidService::GetInstance(
27 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); 30 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
28 } 31 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_device_client.h ('k') | chrome/browser/devtools/device/usb/android_usb_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698