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

Unified Diff: device/bluetooth/bluetooth_utils.cc

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: device/bluetooth/bluetooth_utils.cc
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_utils.cc b/device/bluetooth/bluetooth_utils.cc
similarity index 92%
rename from chrome/browser/chromeos/bluetooth/bluetooth_utils.cc
rename to device/bluetooth/bluetooth_utils.cc
index 02643c6a51d11b2ea969b9df705122c445d3052d..6d064096e77bc51f4ce1801bd5084a321a14ff5e 100644
--- a/chrome/browser/chromeos/bluetooth/bluetooth_utils.cc
+++ b/device/bluetooth/bluetooth_utils.cc
@@ -2,11 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/chromeos/bluetooth/bluetooth_utils.h"
+#include "device/bluetooth/bluetooth_utils.h"
#include <vector>
+#if defined(OS_CHROMEOS)
#include <bluetooth/bluetooth.h>
+#endif
#include "base/logging.h"
#include "base/string_number_conversions.h"
@@ -18,9 +20,10 @@ static const char* kCommonUuidPrefix = "0000";
static const int kUuidSize = 36;
} // namespace
-namespace chromeos {
+namespace device {
namespace bluetooth_utils {
+#if defined(OS_CHROMEOS)
bool str2ba(const std::string& in_address, bdaddr_t* out_address) {
if (!out_address)
return false;
@@ -47,6 +50,7 @@ bool str2ba(const std::string& in_address, bdaddr_t* out_address) {
return false;
}
+#endif
std::string CanonicalUuid(std::string uuid) {
if (uuid.empty())
@@ -85,4 +89,4 @@ std::string CanonicalUuid(std::string uuid) {
}
} // namespace bluetooth_utils
-} // namespace chromeos
+} // namespace device

Powered by Google App Engine
This is Rietveld 408576698