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

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

Issue 11075006: Moved bluetooth adapter files to device/bluetooth/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: renamed 'bluetooth' target to 'device_bluetooth'. 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_utils.h
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.h b/chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.h
index cb8d0898b51b0bc76980c7d424af7b19c5774a5b..364a5d25d21535d0846db03637f4479d31d4fabf 100644
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.h
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.h
@@ -5,28 +5,25 @@
#ifndef CHROME_BROWSER_EXTENSIONS_API_BLUETOOTH_BLUETOOTH_API_UTILS_H_
#define CHROME_BROWSER_EXTENSIONS_API_BLUETOOTH_BLUETOOTH_API_UTILS_H_
-#if defined(OS_CHROMEOS)
-
#include "base/values.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
#include "chrome/common/extensions/api/experimental_bluetooth.h"
+#include "device/bluetooth/bluetooth_device.h"
namespace extensions {
namespace api {
namespace experimental_bluetooth {
-// Fill in a Device object from a chromeos::BluetoothDevice.
+// Fill in a Device object from a BluetoothDevice.
void BluetoothDeviceToApiDevice(
- const chromeos::BluetoothDevice& device,
+ const device::BluetoothDevice& device,
Device* out);
// The caller takes ownership of the returned pointer.
-base::Value* BluetoothDeviceToValue(const chromeos::BluetoothDevice& device);
+base::Value* BluetoothDeviceToValue(
+ const device::BluetoothDevice& device);
} // namespace experimental_bluetooth
} // namespace api
} // namespace extensions
-#endif
-
#endif // CHROME_BROWSER_EXTENSIONS_API_BLUETOOTH_BLUETOOTH_API_UTILS_H_

Powered by Google App Engine
This is Rietveld 408576698