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

Unified Diff: chrome/browser/chromeos/extensions/bluetooth_event_router.cc

Issue 11075006: Moved bluetooth adapter files to device/bluetooth/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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: chrome/browser/chromeos/extensions/bluetooth_event_router.cc
diff --git a/chrome/browser/chromeos/extensions/bluetooth_event_router.cc b/chrome/browser/chromeos/extensions/bluetooth_event_router.cc
index 64331bf5e68518d60bb79c8183fe8048bf522f58..558bc56deeeefc036a16a8703c19915c62992cdb 100644
--- a/chrome/browser/chromeos/extensions/bluetooth_event_router.cc
+++ b/chrome/browser/chromeos/extensions/bluetooth_event_router.cc
@@ -10,14 +10,16 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_vector.h"
#include "base/utf_string_conversions.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_chromeos.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_socket.h"
#include "chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.h"
#include "chrome/browser/extensions/event_names.h"
#include "chrome/browser/extensions/event_router.h"
#include "chrome/common/extensions/api/experimental_bluetooth.h"
+#include "device/bluetooth/bluetooth_adapter.h"
+#include "device/bluetooth/bluetooth_adapter_factory.h"
+#include "device/bluetooth/bluetooth_device.h"
+#include "device/bluetooth/bluetooth_socket.h"
+
+using device_bluetooth::BluetoothSocket;
namespace experimental_bluetooth = extensions::api::experimental_bluetooth;
@@ -25,7 +27,7 @@ namespace chromeos {
ExtensionBluetoothEventRouter::ExtensionBluetoothEventRouter(Profile* profile)
: profile_(profile),
- adapter_(chromeos::BluetoothAdapterFactory::DefaultAdapter()),
+ adapter_(device_bluetooth::BluetoothAdapterFactory::DefaultAdapter()),
next_socket_id_(1) {
DCHECK(profile_);
DCHECK(adapter_.get());
@@ -102,7 +104,7 @@ void ExtensionBluetoothEventRouter::DispatchDeviceEvent(
}
void ExtensionBluetoothEventRouter::AdapterPresentChanged(
- chromeos::BluetoothAdapter* adapter, bool present) {
+ device_bluetooth::BluetoothAdapter* adapter, bool present) {
if (adapter != adapter_.get()) {
DVLOG(1) << "Ignoring event for adapter " << adapter->address();
return;
@@ -114,7 +116,7 @@ void ExtensionBluetoothEventRouter::AdapterPresentChanged(
}
void ExtensionBluetoothEventRouter::AdapterPoweredChanged(
- chromeos::BluetoothAdapter* adapter, bool has_power) {
+ device_bluetooth::BluetoothAdapter* adapter, bool has_power) {
if (adapter != adapter_.get()) {
DVLOG(1) << "Ignoring event for adapter " << adapter->address();
return;
@@ -126,7 +128,7 @@ void ExtensionBluetoothEventRouter::AdapterPoweredChanged(
}
void ExtensionBluetoothEventRouter::AdapterDiscoveringChanged(
- chromeos::BluetoothAdapter* adapter, bool discovering) {
+ device_bluetooth::BluetoothAdapter* adapter, bool discovering) {
if (adapter != adapter_.get()) {
DVLOG(1) << "Ignoring event for adapter " << adapter->address();
return;
@@ -144,7 +146,8 @@ void ExtensionBluetoothEventRouter::AdapterDiscoveringChanged(
}
void ExtensionBluetoothEventRouter::DeviceAdded(
- chromeos::BluetoothAdapter* adapter, chromeos::BluetoothDevice* device) {
+ device_bluetooth::BluetoothAdapter* adapter,
+ device_bluetooth::BluetoothDevice* device) {
if (adapter != adapter_.get()) {
DVLOG(1) << "Ignoring event for adapter " << adapter->address();
return;

Powered by Google App Engine
This is Rietveld 408576698