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

Unified Diff: device/bluetooth/bluetooth_adapter_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_adapter_chromeos.cc
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos.cc b/device/bluetooth/bluetooth_adapter_chromeos.cc
similarity index 98%
rename from chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos.cc
rename to device/bluetooth/bluetooth_adapter_chromeos.cc
index d71dae40d70f6740112a6e53d7921a6f0b8efd4b..740b7d17424ba280f9f104ced75d0d1c713fdd9b 100644
--- a/chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos.cc
+++ b/device/bluetooth/bluetooth_adapter_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_adapter_chromeos.h"
+#include "device/bluetooth/bluetooth_adapter_chromeos.h"
#include <string>
@@ -10,16 +10,20 @@
#include "base/logging.h"
#include "base/stl_util.h"
#include "base/values.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_device_chromeos.h"
#include "chromeos/dbus/bluetooth_adapter_client.h"
#include "chromeos/dbus/bluetooth_device_client.h"
#include "chromeos/dbus/bluetooth_manager_client.h"
#include "chromeos/dbus/bluetooth_out_of_band_client.h"
-#include "chromeos/dbus/bluetooth_out_of_band_pairing_data.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "dbus/object_path.h"
+#include "device/bluetooth/bluetooth_device_chromeos.h"
+#include "device/bluetooth/bluetooth_out_of_band_pairing_data.h"
-namespace chromeos {
+using chromeos::BluetoothAdapterClient;
+using chromeos::BluetoothDeviceClient;
+using chromeos::DBusThreadManager;
+
+namespace bluetooth {
keybuk 2012/10/12 00:13:18 should this be namespace bluetooth or namespace ch
youngki 2012/10/12 01:50:12 I changed bluetooth_adapter_chromeos, bluetooth_de
BluetoothAdapterChromeOs::BluetoothAdapterChromeOs() : track_default_(false),
powered_(false),
@@ -532,4 +536,4 @@ void BluetoothAdapterChromeOs::DeviceDisappeared(
}
}
-} // namespace chromeos
+} // namespace bluetooth

Powered by Google App Engine
This is Rietveld 408576698