summaryrefslogtreecommitdiffstats
path: root/device
diff options
context:
space:
mode:
authorkeybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-03 01:11:11 +0000
committerkeybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-03 01:11:11 +0000
commit47df4951c948781d4f304bcda44222470f6d0feb (patch)
treea64f84e5ccaf210236d5c1cd869dd16a80d4828d /device
parentf8e3b11567bdde775f3a3b42168831f71d352fb5 (diff)
downloadchromium_src-47df4951c948781d4f304bcda44222470f6d0feb.zip
chromium_src-47df4951c948781d4f304bcda44222470f6d0feb.tar.gz
chromium_src-47df4951c948781d4f304bcda44222470f6d0feb.tar.bz2
Bluetooth: rename experimental ChromeOS files
Only files ending in _chromeos.* are automatically excluded from other builds, so rename the experimental files to match that pattern. BUG=none TEST=make Review URL: https://codereview.chromium.org/13460011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191952 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device')
-rw-r--r--device/bluetooth/bluetooth_adapter_experimental_chromeos.cc (renamed from device/bluetooth/bluetooth_adapter_chromeos_experimental.cc)30
-rw-r--r--device/bluetooth/bluetooth_adapter_experimental_chromeos.h (renamed from device/bluetooth/bluetooth_adapter_chromeos_experimental.h)18
-rw-r--r--device/bluetooth/bluetooth_adapter_factory.cc8
-rw-r--r--device/device.gyp4
4 files changed, 30 insertions, 30 deletions
diff --git a/device/bluetooth/bluetooth_adapter_chromeos_experimental.cc b/device/bluetooth/bluetooth_adapter_experimental_chromeos.cc
index 35c0db6..ea0883a 100644
--- a/device/bluetooth/bluetooth_adapter_chromeos_experimental.cc
+++ b/device/bluetooth/bluetooth_adapter_experimental_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 "device/bluetooth/bluetooth_adapter_chromeos_experimental.h"
+#include "device/bluetooth/bluetooth_adapter_experimental_chromeos.h"
#include <string>
@@ -10,65 +10,65 @@ using device::BluetoothAdapter;
namespace chromeos {
-BluetoothAdapterChromeOSExperimental::BluetoothAdapterChromeOSExperimental()
+BluetoothAdapterExperimentalChromeOS::BluetoothAdapterExperimentalChromeOS()
: BluetoothAdapter(),
weak_ptr_factory_(this) {
}
-BluetoothAdapterChromeOSExperimental::~BluetoothAdapterChromeOSExperimental() {
+BluetoothAdapterExperimentalChromeOS::~BluetoothAdapterExperimentalChromeOS() {
}
-void BluetoothAdapterChromeOSExperimental::AddObserver(
+void BluetoothAdapterExperimentalChromeOS::AddObserver(
BluetoothAdapter::Observer* observer) {
}
-void BluetoothAdapterChromeOSExperimental::RemoveObserver(
+void BluetoothAdapterExperimentalChromeOS::RemoveObserver(
BluetoothAdapter::Observer* observer) {
}
-std::string BluetoothAdapterChromeOSExperimental::address() const {
+std::string BluetoothAdapterExperimentalChromeOS::address() const {
return std::string();
}
-std::string BluetoothAdapterChromeOSExperimental::name() const {
+std::string BluetoothAdapterExperimentalChromeOS::name() const {
return std::string();
}
-bool BluetoothAdapterChromeOSExperimental::IsInitialized() const {
+bool BluetoothAdapterExperimentalChromeOS::IsInitialized() const {
return true;
}
-bool BluetoothAdapterChromeOSExperimental::IsPresent() const {
+bool BluetoothAdapterExperimentalChromeOS::IsPresent() const {
return false;
}
-bool BluetoothAdapterChromeOSExperimental::IsPowered() const {
+bool BluetoothAdapterExperimentalChromeOS::IsPowered() const {
return false;
}
-void BluetoothAdapterChromeOSExperimental::SetPowered(bool powered,
+void BluetoothAdapterExperimentalChromeOS::SetPowered(bool powered,
const base::Closure& callback,
const ErrorCallback& error_callback) {
error_callback.Run();
}
-bool BluetoothAdapterChromeOSExperimental::IsDiscovering() const {
+bool BluetoothAdapterExperimentalChromeOS::IsDiscovering() const {
return false;
}
-void BluetoothAdapterChromeOSExperimental::StartDiscovering(
+void BluetoothAdapterExperimentalChromeOS::StartDiscovering(
const base::Closure& callback,
const ErrorCallback& error_callback) {
error_callback.Run();
}
-void BluetoothAdapterChromeOSExperimental::StopDiscovering(
+void BluetoothAdapterExperimentalChromeOS::StopDiscovering(
const base::Closure& callback,
const ErrorCallback& error_callback) {
error_callback.Run();
}
-void BluetoothAdapterChromeOSExperimental::ReadLocalOutOfBandPairingData(
+void BluetoothAdapterExperimentalChromeOS::ReadLocalOutOfBandPairingData(
const BluetoothAdapter::BluetoothOutOfBandPairingDataCallback& callback,
const ErrorCallback& error_callback) {
error_callback.Run();
diff --git a/device/bluetooth/bluetooth_adapter_chromeos_experimental.h b/device/bluetooth/bluetooth_adapter_experimental_chromeos.h
index 72cf039..10b727d 100644
--- a/device/bluetooth/bluetooth_adapter_chromeos_experimental.h
+++ b/device/bluetooth/bluetooth_adapter_experimental_chromeos.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_EXPERIMENTAL_H_
-#define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_EXPERIMENTAL_H_
+#ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_EXPERIMENTAL_CHROMEOS_H_
+#define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_EXPERIMENTAL_CHROMEOS_H_
#include <string>
@@ -18,11 +18,11 @@ class BluetoothAdapterFactory;
namespace chromeos {
-// The BluetoothAdapterChromeOSExperimental class is an alternate implementation
+// The BluetoothAdapterExperimentalChromeOS class is an alternate implementation
// of BluetoothAdapter for the Chrome OS platform using the Bluetooth Smart
// capable backend. It will become the sole implementation for Chrome OS, and
// be renamed to BluetoothAdapterChromeOS, once the backend is switched,
-class BluetoothAdapterChromeOSExperimental
+class BluetoothAdapterExperimentalChromeOS
: public device::BluetoothAdapter {
public:
// BluetoothAdapter override
@@ -54,16 +54,16 @@ class BluetoothAdapterChromeOSExperimental
private:
friend class device::BluetoothAdapterFactory;
- BluetoothAdapterChromeOSExperimental();
- virtual ~BluetoothAdapterChromeOSExperimental();
+ BluetoothAdapterExperimentalChromeOS();
+ virtual ~BluetoothAdapterExperimentalChromeOS();
// Note: This should remain the last member so it'll be destroyed and
// invalidate its weak pointers before any other members are destroyed.
- base::WeakPtrFactory<BluetoothAdapterChromeOSExperimental> weak_ptr_factory_;
+ base::WeakPtrFactory<BluetoothAdapterExperimentalChromeOS> weak_ptr_factory_;
- DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterChromeOSExperimental);
+ DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterExperimentalChromeOS);
};
} // namespace chromeos
-#endif // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_EXPERIMENTAL_H_
+#endif // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_EXPERIMENTAL_CHROMEOS_H_
diff --git a/device/bluetooth/bluetooth_adapter_factory.cc b/device/bluetooth/bluetooth_adapter_factory.cc
index 211cef9..9e8e75a 100644
--- a/device/bluetooth/bluetooth_adapter_factory.cc
+++ b/device/bluetooth/bluetooth_adapter_factory.cc
@@ -16,7 +16,7 @@
#if defined(OS_CHROMEOS)
#include "device/bluetooth/bluetooth_adapter_chromeos.h"
-#include "device/bluetooth/bluetooth_adapter_chromeos_experimental.h"
+#include "device/bluetooth/bluetooth_adapter_experimental_chromeos.h"
#elif defined(OS_WIN)
#include "device/bluetooth/bluetooth_adapter_win.h"
#elif defined(OS_MACOSX)
@@ -79,12 +79,12 @@ void BluetoothAdapterFactory::GetAdapter(const AdapterCallback& callback) {
#if defined(OS_CHROMEOS)
if (CommandLine::ForCurrentProcess()->HasSwitch(
chromeos::switches::kEnableExperimentalBluetooth)) {
- chromeos::BluetoothAdapterChromeOSExperimental* new_adapter =
- new chromeos::BluetoothAdapterChromeOSExperimental;
+ chromeos::BluetoothAdapterExperimentalChromeOS* new_adapter =
+ new chromeos::BluetoothAdapterExperimentalChromeOS();
default_adapter.Get() = new_adapter->weak_ptr_factory_.GetWeakPtr();
} else {
chromeos::BluetoothAdapterChromeOS* new_adapter =
- new chromeos::BluetoothAdapterChromeOS;
+ new chromeos::BluetoothAdapterChromeOS();
default_adapter.Get() = new_adapter->weak_ptr_factory_.GetWeakPtr();
}
#elif defined(OS_WIN)
diff --git a/device/device.gyp b/device/device.gyp
index f3de857..bd0cd3d 100644
--- a/device/device.gyp
+++ b/device/device.gyp
@@ -23,8 +23,8 @@
'bluetooth/bluetooth_adapter.h',
'bluetooth/bluetooth_adapter_chromeos.cc',
'bluetooth/bluetooth_adapter_chromeos.h',
- 'bluetooth/bluetooth_adapter_chromeos_experimental.cc',
- 'bluetooth/bluetooth_adapter_chromeos_experimental.h',
+ 'bluetooth/bluetooth_adapter_experimental_chromeos.cc',
+ 'bluetooth/bluetooth_adapter_experimental_chromeos.h',
'bluetooth/bluetooth_adapter_factory.cc',
'bluetooth/bluetooth_adapter_factory.h',
'bluetooth/bluetooth_adapter_mac.h',