Index: chrome/browser/chromeos/extensions/bluetooth_event_router.h |
diff --git a/chrome/browser/chromeos/extensions/bluetooth_event_router.h b/chrome/browser/chromeos/extensions/bluetooth_event_router.h |
index 6715c4e374c1ca2c5e311f959463ff7f88f919d5..d2c4f8e965bf61dce1984ad9ec3792a45fda84bc 100644 |
--- a/chrome/browser/chromeos/extensions/bluetooth_event_router.h |
+++ b/chrome/browser/chromeos/extensions/bluetooth_event_router.h |
@@ -9,23 +9,29 @@ |
#include "base/memory/ref_counted.h" |
#include "base/memory/scoped_vector.h" |
-#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h" |
-#include "chrome/browser/chromeos/bluetooth/bluetooth_socket.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/common/extensions/api/experimental_bluetooth.h" |
+#include "device/bluetooth/bluetooth_adapter.h" |
+#include "device/bluetooth/bluetooth_socket.h" |
+ |
+using device_bluetooth::BluetoothSocket; |
namespace chromeos { |
class ExtensionBluetoothEventRouter |
- : public chromeos::BluetoothAdapter::Observer { |
+ : public device_bluetooth::BluetoothAdapter::Observer { |
public: |
explicit ExtensionBluetoothEventRouter(Profile* profile); |
virtual ~ExtensionBluetoothEventRouter(); |
- const chromeos::BluetoothAdapter& adapter() const { return *adapter_.get(); } |
+ const device_bluetooth::BluetoothAdapter& adapter() const { |
+ return *adapter_.get(); |
+ } |
// GetMutableAdapter will never return NULL. |
- chromeos::BluetoothAdapter* GetMutableAdapter() { return adapter_.get(); } |
+ device_bluetooth::BluetoothAdapter* GetMutableAdapter() { |
+ return adapter_.get(); |
+ } |
// Register the BluetoothSocket |socket| for use by the extensions system. |
// This class will hold onto the socket for its lifetime, or until |
@@ -52,18 +58,21 @@ class ExtensionBluetoothEventRouter |
const char* event_name, |
const extensions::api::experimental_bluetooth::Device& device); |
- // Override from chromeos::BluetoothAdapter::Observer |
- virtual void AdapterPresentChanged(chromeos::BluetoothAdapter* adapter, |
- bool present) OVERRIDE; |
- virtual void AdapterPoweredChanged(chromeos::BluetoothAdapter* adapter, |
- bool has_power) OVERRIDE; |
- virtual void AdapterDiscoveringChanged(chromeos::BluetoothAdapter* adapter, |
- bool discovering) OVERRIDE; |
- virtual void DeviceAdded(chromeos::BluetoothAdapter* adapter, |
- chromeos::BluetoothDevice* device) OVERRIDE; |
+ // Override from device_bluetooth::BluetoothAdapter::Observer |
+ virtual void AdapterPresentChanged( |
+ device_bluetooth::BluetoothAdapter* adapter, |
+ bool present) OVERRIDE; |
+ virtual void AdapterPoweredChanged( |
+ device_bluetooth::BluetoothAdapter* adapter, |
+ bool has_power) OVERRIDE; |
+ virtual void AdapterDiscoveringChanged( |
+ device_bluetooth::BluetoothAdapter* adapter, |
+ bool discovering) OVERRIDE; |
+ virtual void DeviceAdded(device_bluetooth::BluetoothAdapter* adapter, |
+ device_bluetooth::BluetoothDevice* device) OVERRIDE; |
// Exposed for testing. |
- void SetAdapterForTest(chromeos::BluetoothAdapter* adapter) { |
+ void SetAdapterForTest(device_bluetooth::BluetoothAdapter* adapter) { |
adapter_ = adapter; |
} |
private: |
@@ -73,7 +82,7 @@ class ExtensionBluetoothEventRouter |
bool responsible_for_discovery_; |
Profile* profile_; |
- scoped_refptr<chromeos::BluetoothAdapter> adapter_; |
+ scoped_refptr<device_bluetooth::BluetoothAdapter> adapter_; |
// The next id to use for referring to a BluetoothSocket. We avoid using |
// the fd of the socket because we don't want to leak that information to |