diff options
| author | oshima <oshima@chromium.org> | 2016-02-03 15:53:15 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-03 23:54:17 +0000 |
| commit | 4fdd090367b8b07cd32ff27d9c4691ebbaabbfdf (patch) | |
| tree | 78a2dfc23cf736a02e97e1a7e0f325ae90b94cba | |
| parent | d0cdaba99bb6b4042a04048ebad318c95211d095 (diff) | |
| download | chromium_src-4fdd090367b8b07cd32ff27d9c4691ebbaabbfdf.zip chromium_src-4fdd090367b8b07cd32ff27d9c4691ebbaabbfdf.tar.gz chromium_src-4fdd090367b8b07cd32ff27d9c4691ebbaabbfdf.tar.bz2 | |
Initialize BluezDBusManager in ash_shell_with_content
BUG=None
R=stevenjb@chromium.org
Review URL: https://codereview.chromium.org/1665913002
Cr-Commit-Position: refs/heads/master@{#373391}
| -rw-r--r-- | ash/shell/content/client/shell_browser_main_parts.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/shell/content/client/shell_browser_main_parts.cc b/ash/shell/content/client/shell_browser_main_parts.cc index aa13b3b..636a7c9 100644 --- a/ash/shell/content/client/shell_browser_main_parts.cc +++ b/ash/shell/content/client/shell_browser_main_parts.cc @@ -43,6 +43,7 @@ #if defined(OS_CHROMEOS) #include "chromeos/audio/cras_audio_handler.h" #include "chromeos/dbus/dbus_thread_manager.h" +#include "device/bluetooth/dbus/bluez_dbus_manager.h" #endif namespace ash { @@ -120,6 +121,8 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() { // Create CrasAudioHandler for testing since g_browser_process // is absent. chromeos::CrasAudioHandler::InitializeForTesting(); + + bluez::BluezDBusManager::Initialize(nullptr, true /* use stub */); #endif ShellContentState::SetInstance( |