chrome/common/extensions/permissions/bluetooth_device_permission.cc - Issue 12018024: Implemented Asynchronous Initialization of BluetoothAdapter.

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: chrome/common/extensions/permissions/bluetooth_device_permission.cc

Issue 12018024: Implemented Asynchronous Initialization of BluetoothAdapter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Renamed RunCallbackOnAdapterReady to GetAdapter. Created 7 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 | « chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc ('k') | device/bluetooth/bluetooth_adapter.h » ('j') | device/bluetooth/bluetooth_adapter_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/permissions/bluetooth_device_permission.cc

diff --git a/chrome/common/extensions/permissions/bluetooth_device_permission.cc b/chrome/common/extensions/permissions/bluetooth_device_permission.cc

index fccd9e576c82c035510276495b678b7378c4bae5..8cb0b1810d896cec410835efc704532859e10b7d 100644

--- a/chrome/common/extensions/permissions/bluetooth_device_permission.cc

+++ b/chrome/common/extensions/permissions/bluetooth_device_permission.cc

@@ -39,7 +39,7 @@ PermissionMessages BluetoothDevicePermission::GetMessages() const {

PermissionMessages result;

scoped_refptr<device::BluetoothAdapter> bluetooth_adapter =

- device::BluetoothAdapterFactory::GetAdapter();

+ device::BluetoothAdapterFactory::MaybeGetAdapter();

for (std::set<BluetoothDevicePermissionData>::const_iterator i =

data_set_.begin(); i != data_set_.end(); ++i) {