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

Side by Side Diff: extensions/shell/browser/shell_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
« no previous file with comments | « extensions/shell/browser/shell_device_client.h ('k') | no next file » | 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 "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"
11 11
12 using content::BrowserThread; 12 using content::BrowserThread;
13 13
14 namespace extensions { 14 namespace extensions {
15 15
16 ShellDeviceClient::ShellDeviceClient() {} 16 ShellDeviceClient::ShellDeviceClient() {}
17 17
18 ShellDeviceClient::~ShellDeviceClient() {} 18 ShellDeviceClient::~ShellDeviceClient() {}
19 19
20 device::UsbService* ShellDeviceClient::GetUsbService() { 20 device::UsbService* ShellDeviceClient::GetUsbService() {
21 DCHECK_CURRENTLY_ON(BrowserThread::UI); 21 DCHECK_CURRENTLY_ON(BrowserThread::UI);
22 return device::UsbService::GetInstance( 22
23 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); 23 if (!usb_service_) {
24 usb_service_ = device::UsbService::Create(
25 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
26 }
27 return usb_service_.get();
24 } 28 }
25 29
26 device::HidService* ShellDeviceClient::GetHidService() { 30 device::HidService* ShellDeviceClient::GetHidService() {
27 DCHECK_CURRENTLY_ON(BrowserThread::UI); 31 DCHECK_CURRENTLY_ON(BrowserThread::UI);
28 return device::HidService::GetInstance( 32 return device::HidService::GetInstance(
29 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); 33 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
30 } 34 }
31 35
32 } 36 }
OLDNEW
« no previous file with comments | « extensions/shell/browser/shell_device_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698