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

Unified Diff: chrome/browser/extensions/api/bluetooth/bluetooth_api.h

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/extensions/api/bluetooth/bluetooth_api.h
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api.h b/chrome/browser/extensions/api/bluetooth/bluetooth_api.h
index 0f57f27284bed835f72cb61a1c4bffa67ef2a4ee..2f8e4d0901113ff08c98cf03f04d4bdb44d5cede 100644
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_api.h
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api.h
@@ -12,15 +12,15 @@
#if defined(OS_CHROMEOS)
#include "base/memory/ref_counted.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_socket.h"
+#include "device/bluetooth/bluetooth_device.h"
+#include "device/bluetooth/bluetooth_socket.h"
-namespace chromeos {
+namespace device_bluetooth {
class BluetoothSocket;
struct BluetoothOutOfBandPairingData;
-} // namespace chromeos
+} // namespace device_bluetooth
#endif
namespace extensions {
@@ -86,8 +86,9 @@ class BluetoothGetDevicesFunction : public AsyncExtensionFunction {
private:
#if defined(OS_CHROMEOS)
- void DispatchDeviceSearchResult(const chromeos::BluetoothDevice& device);
- void ProvidesServiceCallback(const chromeos::BluetoothDevice* device,
+ void DispatchDeviceSearchResult(
+ const device_bluetooth::BluetoothDevice& device);
+ void ProvidesServiceCallback(const device_bluetooth::BluetoothDevice* device,
bool providesService);
int callbacks_pending_;
@@ -108,7 +109,7 @@ class BluetoothGetServicesFunction : public AsyncExtensionFunction {
private:
void GetServiceRecordsCallback(
base::ListValue* services,
- const chromeos::BluetoothDevice::ServiceRecordList& records);
+ const device_bluetooth::BluetoothDevice::ServiceRecordList& records);
void OnErrorCallback();
#endif
};
@@ -125,9 +126,9 @@ class BluetoothConnectFunction : public AsyncExtensionFunction {
private:
#if defined(OS_CHROMEOS)
void ConnectToServiceCallback(
- const chromeos::BluetoothDevice* device,
+ const device_bluetooth::BluetoothDevice* device,
const std::string& service_uuid,
- scoped_refptr<chromeos::BluetoothSocket> socket);
+ scoped_refptr<device_bluetooth::BluetoothSocket> socket);
#endif
};
@@ -158,7 +159,7 @@ class BluetoothReadFunction : public AsyncApiFunction {
private:
#if defined(OS_CHROMEOS)
bool success_;
- scoped_refptr<chromeos::BluetoothSocket> socket_;
+ scoped_refptr<device_bluetooth::BluetoothSocket> socket_;
#endif
};
@@ -179,7 +180,7 @@ class BluetoothWriteFunction : public AsyncApiFunction {
#if defined(OS_CHROMEOS)
bool success_;
const base::BinaryValue* data_to_write_; // memory is owned by args_
- scoped_refptr<chromeos::BluetoothSocket> socket_;
+ scoped_refptr<device_bluetooth::BluetoothSocket> socket_;
#endif
};
@@ -211,7 +212,8 @@ class BluetoothGetLocalOutOfBandPairingDataFunction
virtual ~BluetoothGetLocalOutOfBandPairingDataFunction() {}
#if defined(OS_CHROMEOS)
- void ReadCallback(const chromeos::BluetoothOutOfBandPairingData& data);
+ void ReadCallback(
+ const device_bluetooth::BluetoothOutOfBandPairingData& data);
void ErrorCallback();
#endif

Powered by Google App Engine
This is Rietveld 408576698