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

Unified Diff: content/shell/browser/shell_views.cc

Issue 848613003: bluetooth: Shutdown BluetoothAdapter before DBus on ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: unit test Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/DEPS ('k') | device/bluetooth/bluetooth_adapter_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell_views.cc
diff --git a/content/shell/browser/shell_views.cc b/content/shell/browser/shell_views.cc
index 734e637ed05c95ba55c6a7db959541021521e883..5bc75b02a95e11fdd162a2ed2eab45d706be4f30 100644
--- a/content/shell/browser/shell_views.cc
+++ b/content/shell/browser/shell_views.cc
@@ -11,6 +11,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/common/context_menu_params.h"
#include "content/shell/browser/shell_platform_data_aura.h"
+#include "device/bluetooth/bluetooth_adapter_factory.h"
#include "ui/aura/client/screen_position_client.h"
#include "ui/aura/env.h"
#include "ui/aura/window.h"
@@ -440,6 +441,7 @@ void Shell::PlatformExit() {
delete platform_;
platform_ = NULL;
#if defined(OS_CHROMEOS)
+ device::BluetoothAdapterFactory::OnDBusThreadManagerShutdown();
jam 2015/01/15 23:24:12 it seems a bit odd that content shell has to do th
scheib 2015/01/16 17:41:53 Content shell will use BT soon, https://codereview
chromeos::DBusThreadManager::Shutdown();
#endif
aura::Env::DeleteInstance();
« no previous file with comments | « content/shell/DEPS ('k') | device/bluetooth/bluetooth_adapter_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698