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

Side by Side Diff: extensions/shell/browser/shell_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: Add more thread assertions. 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 "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;
13
12 namespace extensions { 14 namespace extensions {
13 15
14 ShellDeviceClient::ShellDeviceClient() {} 16 ShellDeviceClient::ShellDeviceClient() {}
15 17
16 ShellDeviceClient::~ShellDeviceClient() {} 18 ShellDeviceClient::~ShellDeviceClient() {}
17 19
18 device::UsbService* ShellDeviceClient::GetUsbService() { 20 device::UsbService* ShellDeviceClient::GetUsbService() {
21 DCHECK_CURRENTLY_ON(BrowserThread::UI);
19 return device::UsbService::GetInstance( 22 return device::UsbService::GetInstance(
20 content::BrowserThread::GetMessageLoopProxyForThread( 23 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
21 content::BrowserThread::UI));
22 } 24 }
23 25
24 device::HidService* ShellDeviceClient::GetHidService() { 26 device::HidService* ShellDeviceClient::GetHidService() {
27 DCHECK_CURRENTLY_ON(BrowserThread::UI);
25 return device::HidService::GetInstance( 28 return device::HidService::GetInstance(
26 content::BrowserThread::GetMessageLoopProxyForThread( 29 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
27 content::BrowserThread::FILE));
28 } 30 }
29 31
30 } 32 }
OLDNEW
« no previous file with comments | « extensions/browser/api/usb/usb_event_router.cc ('k') | extensions/test/data/api_test/usb/reset_device/test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698