content/shell/browser/shell_views.cc - Issue 848613003: bluetooth: Shutdown BluetoothAdapter before DBus on ChromeOS.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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

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..6805aa2ad5d706beacdcd23efbc9e6f3f483d851 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::Shutdown();

chromeos::DBusThreadManager::Shutdown();

#endif

aura::Env::DeleteInstance();

« no previous file with comments | « content/shell/DEPS ('k') | device/bluetooth/bluetooth_adapter.h » ('j') | device/bluetooth/bluetooth_adapter.h » ('J')