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

Side by Side Diff: chrome/browser/chrome_device_client.cc

Issue 980023002: Move device/usb classes from the FILE thread to UI thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Allow USB transfer calls from any thread again. Created 5 years, 8 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;
13
12 ChromeDeviceClient::ChromeDeviceClient() {} 14 ChromeDeviceClient::ChromeDeviceClient() {}
13 15
14 ChromeDeviceClient::~ChromeDeviceClient() {} 16 ChromeDeviceClient::~ChromeDeviceClient() {}
15 17
16 device::UsbService* ChromeDeviceClient::GetUsbService() { 18 device::UsbService* ChromeDeviceClient::GetUsbService() {
19 DCHECK_CURRENTLY_ON(BrowserThread::UI);
17 return device::UsbService::GetInstance( 20 return device::UsbService::GetInstance(
18 content::BrowserThread::GetMessageLoopProxyForThread( 21 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
19 content::BrowserThread::UI));
20 } 22 }
21 23
22 device::HidService* ChromeDeviceClient::GetHidService() { 24 device::HidService* ChromeDeviceClient::GetHidService() {
25 DCHECK_CURRENTLY_ON(BrowserThread::UI);
23 return device::HidService::GetInstance( 26 return device::HidService::GetInstance(
24 content::BrowserThread::GetMessageLoopProxyForThread( 27 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
25 content::BrowserThread::FILE));
26 } 28 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698