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

Unified Diff: chrome/browser/chromeos/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: 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/chromeos/bluetooth/bluetooth_socket_chromeos.cc
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_socket_chromeos.cc b/chrome/browser/chromeos/bluetooth/bluetooth_socket_chromeos.cc
deleted file mode 100644
index f86f9c56092ad1eb4e7dd64929473970e546e605..0000000000000000000000000000000000000000
--- a/chrome/browser/chromeos/bluetooth/bluetooth_socket_chromeos.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// 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 <vector>
-
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/rfcomm.h>
-#include <errno.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "base/logging.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_service_record.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_utils.h"
-
-namespace chromeos {
-
-BluetoothSocketChromeOs::BluetoothSocketChromeOs(
- const std::string& address, int fd)
- : address_(address),
- fd_(fd) {
-}
-
-BluetoothSocketChromeOs::~BluetoothSocketChromeOs() {
- close(fd_);
-}
-
-// static
-scoped_refptr<BluetoothSocket> BluetoothSocketChromeOs::CreateBluetoothSocket(
- const BluetoothServiceRecord& service_record) {
- BluetoothSocketChromeOs* bluetooth_socket = NULL;
- if (service_record.SupportsRfcomm()) {
- int socket_fd = socket(
- AF_BLUETOOTH, SOCK_STREAM | SOCK_NONBLOCK, BTPROTO_RFCOMM);
- 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(),
- &socket_address.rc_bdaddr);
-
- int status = connect(socket_fd, (struct sockaddr *)&socket_address,
- sizeof(socket_address));
- int errsv = errno;
- if (status == 0 || errno == EINPROGRESS) {
- bluetooth_socket = new BluetoothSocketChromeOs(service_record.address(),
- socket_fd);
- } else {
- LOG(ERROR) << "Failed to connect bluetooth socket "
- << "(" << service_record.address() << "): "
- << "(" << errsv << ") " << strerror(errsv);
- close(socket_fd);
- }
- }
- // TODO(bryeung): add support for L2CAP sockets as well.
-
- return scoped_refptr<BluetoothSocketChromeOs>(bluetooth_socket);
-}
-
-int BluetoothSocketChromeOs::fd() const {
- return fd_;
-}
-
-} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698