diff options
| author | reillyg <reillyg@chromium.org> | 2014-08-28 18:58:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-29 01:59:51 +0000 |
| commit | e471fab8c731cfc2eacceca8cc5be524c2d6f4b4 (patch) | |
| tree | 3ecc233a2dc5c66b1f980e335f1a92f027f2d95f /chrome/browser/browser_process_impl.cc | |
| parent | a859ef1cc6d20bd833c84cd2d126cf49440b16f7 (diff) | |
| download | chromium_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.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 06301fd..ffa2082 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -106,6 +106,7 @@ #if defined(OS_ANDROID) #include "components/gcm_driver/gcm_driver_android.h" #else +#include "chrome/browser/chrome_device_client.h" #include "chrome/browser/services/gcm/gcm_desktop_utils.h" #include "components/gcm_driver/gcm_client_factory.h" #endif @@ -194,6 +195,10 @@ BrowserProcessImpl::BrowserProcessImpl( InitIdleMonitor(); #endif +#if !defined(OS_ANDROID) + device_client_.reset(new ChromeDeviceClient); +#endif + #if defined(ENABLE_EXTENSIONS) apps::AppsClient::Set(ChromeAppsClient::GetInstance()); |