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

Unified Diff: device/bluetooth/bluetooth_socket_chromeos.cc

Issue 11075006: Moved bluetooth adapter files to device/bluetooth/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix so that this CL compiles on Windows. 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_socket_chromeos.cc
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_socket_chromeos.cc b/device/bluetooth/bluetooth_socket_chromeos.cc
similarity index 85%
rename from chrome/browser/chromeos/bluetooth/bluetooth_socket_chromeos.cc
rename to device/bluetooth/bluetooth_socket_chromeos.cc
index f86f9c56092ad1eb4e7dd64929473970e546e605..9234538a7cb758f427e139089558544ae32e0d87 100644
--- a/chrome/browser/chromeos/bluetooth/bluetooth_socket_chromeos.cc
+++ b/device/bluetooth/bluetooth_socket_chromeos.cc
@@ -2,7 +2,7 @@
// 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_socket_chromeos.h"
+#include "device/bluetooth/bluetooth_socket_chromeos.h"
#include <vector>
@@ -15,10 +15,10 @@
#include <unistd.h>
#include "base/logging.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_service_record.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_utils.h"
+#include "device/bluetooth/bluetooth_service_record.h"
+#include "device/bluetooth/bluetooth_utils.h"
-namespace chromeos {
+namespace bluetooth {
keybuk 2012/10/12 00:13:18 namespace?
youngki 2012/10/12 01:50:12 Done.
BluetoothSocketChromeOs::BluetoothSocketChromeOs(
const std::string& address, int fd)
@@ -40,7 +40,7 @@ scoped_refptr<BluetoothSocket> BluetoothSocketChromeOs::CreateBluetoothSocket(
struct sockaddr_rc socket_address = { 0 };
socket_address.rc_family = AF_BLUETOOTH;
socket_address.rc_channel = service_record.rfcomm_channel();
- bluetooth_utils::str2ba(service_record.address(),
+ utils::str2ba(service_record.address(),
&socket_address.rc_bdaddr);
int status = connect(socket_fd, (struct sockaddr *)&socket_address,
@@ -65,4 +65,4 @@ int BluetoothSocketChromeOs::fd() const {
return fd_;
}
-} // namespace chromeos
+} // namespace bluetooth

Powered by Google App Engine
This is Rietveld 408576698