chrome/browser/chromeos/system/ash_system_tray_delegate.cc - Issue 10899037: Refactoring bluetooth API code.

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 10899037: Refactoring bluetooth API code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Removed ASSERT_TRUE checks. Created 8 years, 3 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 f48397666946ee8fe1bb03a20551dc2853682036..42e58eea2044e8f83498cef49a6a45111413bef8 100644

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

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

@@ -32,6 +32,7 @@

#include "chrome/browser/chromeos/accessibility/accessibility_util.h"

#include "chrome/browser/chromeos/audio/audio_handler.h"

#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"

+#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter_factory.h"

#include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"

#include "chrome/browser/chromeos/cros/cros_library.h"

#include "chrome/browser/chromeos/cros/network_library.h"

@@ -216,7 +217,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,

network_icon_->SetResourceColorTheme(NetworkMenuIcon::COLOR_LIGHT);

network_icon_dark_->SetResourceColorTheme(NetworkMenuIcon::COLOR_DARK);

- bluetooth_adapter_ = BluetoothAdapter::DefaultAdapter();

+ bluetooth_adapter_ = BluetoothAdapterFactory::DefaultAdapter();

bluetooth_adapter_->AddObserver(this);

}