From a09e270efdca610340aa7a0116beae095b817ad9 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Tue, 31 May 2016 12:36:51 +0530 Subject: [PATCH] initialize bluetooth for linux --- brightray/browser/browser_main_parts.cc | 15 +++++++++++++++ brightray/browser/browser_main_parts.h | 1 + 2 files changed, 16 insertions(+) diff --git a/brightray/browser/browser_main_parts.cc b/brightray/browser/browser_main_parts.cc index 43c49de8d441..6cf1f4fd5a02 100644 --- a/brightray/browser/browser_main_parts.cc +++ b/brightray/browser/browser_main_parts.cc @@ -48,6 +48,11 @@ #include "ui/gfx/platform_font_win.h" #endif +#if defined(OS_LINUX) +#include "device/bluetooth/bluetooth_adapter_factory.h" +#include "device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.h" +#endif + using content::BrowserThread; namespace brightray { @@ -219,6 +224,9 @@ void BrowserMainParts::PostMainMessageLoopStart() { // if X exits before us. ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler); #endif +#if defined(OS_LINUX) + bluez::DBusBluezManagerWrapperLinux::Initialize(); +#endif } void BrowserMainParts::PostMainMessageLoopRun() { @@ -244,4 +252,11 @@ int BrowserMainParts::PreCreateThreads() { return 0; } +void BrowserMainParts::PostDestroyThreads() { +#if defined(OS_LINUX) + device::BluetoothAdapterFactory::Shutdown(); + bluez::DBusBluezManagerWrapperLinux::Shutdown(); +#endif +} + } // namespace brightray diff --git a/brightray/browser/browser_main_parts.h b/brightray/browser/browser_main_parts.h index 40adc027282d..042f5d62c74d 100644 --- a/brightray/browser/browser_main_parts.h +++ b/brightray/browser/browser_main_parts.h @@ -45,6 +45,7 @@ class BrowserMainParts : public content::BrowserMainParts { void PostMainMessageLoopStart() override; void PostMainMessageLoopRun() override; int PreCreateThreads() override; + void PostDestroyThreads() override; private: #if defined(OS_MACOSX)