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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 848613003: bluetooth: Shutdown BluetoothAdapter before DBus on ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: --set-upstream-to=origin/master 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 | « no previous file | device/bluetooth/bluetooth_adapter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 61ad5b53629e96199a6ad977243c597382001d95..52a418cd83819b8b5b1934037c3bc6a5d031975f 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -118,6 +118,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_service.h"
#include "content/public/common/main_function_params.h"
+#include "device/bluetooth/bluetooth_adapter_factory.h"
#include "media/audio/sounds/sounds_manager.h"
#include "net/base/network_change_notifier.h"
#include "net/socket/ssl_server_socket.h"
@@ -228,24 +229,18 @@ class DBusServices {
~DBusServices() {
ui::NetworkConnect::Shutdown();
network_connect_delegate_.reset();
-
CertLibrary::Shutdown();
NetworkHandler::Shutdown();
-
cryptohome::AsyncMethodCaller::Shutdown();
disks::DiskMountManager::Shutdown();
-
SystemSaltGetter::Shutdown();
LoginState::Shutdown();
CertLoader::Shutdown();
TPMTokenLoader::Shutdown();
-
CrosDBusService::Shutdown();
-
- // Shutdown the PowerDataCollector before shutting down DBusThreadManager.
PowerDataCollector::Shutdown();
-
PowerPolicyController::Shutdown();
+ device::BluetoothAdapterFactory::Shutdown();
// NOTE: This must only be called if Initialize() was called.
DBusThreadManager::Shutdown();
« no previous file with comments | « no previous file | device/bluetooth/bluetooth_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698