chrome/browser/chromeos/system/ash_system_tray_delegate.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/browser/chromeos/system/ash_system_tray_delegate.cc

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

Patch Set: Replaced bluetooth_includes_win.h with bluetooth_init_win.h 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:

Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

index 0c8f7ab8f88d55358d8922ac185c5bd0db4dbbc1..83de8c7564f470a8bea8d776ce01035929843f87 100644

--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

@@ -268,7 +268,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,

network_icon_->SetResourceColorTheme(NetworkMenuIcon::COLOR_LIGHT);

network_icon_dark_->SetResourceColorTheme(NetworkMenuIcon::COLOR_DARK);

- device::BluetoothAdapterFactory::RunCallbackOnAdapterReady(

+ device::BluetoothAdapterFactory::GetAdapter(

base::Bind(&SystemTrayDelegate::InitializeOnAdapterReady,

ui_weak_ptr_factory_->GetWeakPtr()));

}