summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_process_impl.h
diff options
context:
space:
mode:
authorreillyg <reillyg@chromium.org>2014-08-28 18:58:43 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-29 01:59:51 +0000
commite471fab8c731cfc2eacceca8cc5be524c2d6f4b4 (patch)
tree3ecc233a2dc5c66b1f980e335f1a92f027f2d95f /chrome/browser/browser_process_impl.h
parenta859ef1cc6d20bd833c84cd2d126cf49440b16f7 (diff)
downloadchromium_src-e471fab8c731cfc2eacceca8cc5be524c2d6f4b4.zip
chromium_src-e471fab8c731cfc2eacceca8cc5be524c2d6f4b4.tar.gz
chromium_src-e471fab8c731cfc2eacceca8cc5be524c2d6f4b4.tar.bz2
Remove BrowserThread dependency from usb_service.
Instead of explicitly depending on specific browser threads the USB service can assume that it is instantiated on BrowserThread::FILE (or equivalent) and save a TaskRunner reference from this instantiation for later use when called from other threads. To reach BrowserThread::UI (required for DBus on Chrome OS) a reference to the appropriate TaskRunner must be provided when calling UsbService::GetInstance(). BUG= Review URL: https://codereview.chromium.org/507503002 Cr-Commit-Position: refs/heads/master@{#292546}
Diffstat (limited to 'chrome/browser/browser_process_impl.h')
-rw-r--r--chrome/browser/browser_process_impl.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 8fd4ce5..937f813 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -21,6 +21,7 @@
#include "base/timer/timer.h"
#include "chrome/browser/browser_process.h"
+class ChromeDeviceClient;
class ChromeNetLog;
class ChromeResourceDispatcherHostDelegate;
class RemoteDebuggingServer;
@@ -300,6 +301,10 @@ class BrowserProcessImpl : public BrowserProcess,
scoped_ptr<gcm::GCMDriver> gcm_driver_;
+#if !defined(OS_ANDROID)
+ scoped_ptr<ChromeDeviceClient> device_client_;
+#endif
+
DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
};