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

Unified Diff: chrome/browser/extensions/api/bluetooth/bluetooth_api.h

Issue 10383198: Move helper functions into the anonymous namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix non-chromeos compiles Created 8 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/extensions/api/bluetooth/bluetooth_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/bluetooth/bluetooth_api.h
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api.h b/chrome/browser/extensions/api/bluetooth/bluetooth_api.h
index d25c6309e1d9b77b67963858f7ae5472fda96bd5..f8e5f3d882ef616be12e0706dc4cbab5d5911522 100644
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_api.h
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api.h
@@ -24,29 +24,7 @@ class ExtensionBluetoothEventRouter;
namespace extensions {
namespace api {
-class BluetoothExtensionFunction : public SyncExtensionFunction {
- protected:
- virtual ~BluetoothExtensionFunction() {}
-
-#if defined(OS_CHROMEOS)
- chromeos::ExtensionBluetoothEventRouter* event_router();
- const chromeos::BluetoothAdapter* adapter() const;
- chromeos::BluetoothAdapter* GetMutableAdapter();
-#endif
-};
-
-class AsyncBluetoothExtensionFunction : public AsyncExtensionFunction {
- protected:
- virtual ~AsyncBluetoothExtensionFunction() {}
-
-#if defined(OS_CHROMEOS)
- chromeos::ExtensionBluetoothEventRouter* event_router();
- const chromeos::BluetoothAdapter* adapter() const;
- chromeos::BluetoothAdapter* GetMutableAdapter();
-#endif
-};
-
-class BluetoothIsAvailableFunction : public BluetoothExtensionFunction {
+class BluetoothIsAvailableFunction : public SyncExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION_NAME("experimental.bluetooth.isAvailable")
@@ -57,7 +35,7 @@ class BluetoothIsAvailableFunction : public BluetoothExtensionFunction {
virtual bool RunImpl() OVERRIDE;
};
-class BluetoothIsPoweredFunction : public BluetoothExtensionFunction {
+class BluetoothIsPoweredFunction : public SyncExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION_NAME("experimental.bluetooth.isPowered")
@@ -68,7 +46,7 @@ class BluetoothIsPoweredFunction : public BluetoothExtensionFunction {
virtual bool RunImpl() OVERRIDE;
};
-class BluetoothGetAddressFunction : public BluetoothExtensionFunction {
+class BluetoothGetAddressFunction : public SyncExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION_NAME("experimental.bluetooth.getAddress")
@@ -80,7 +58,7 @@ class BluetoothGetAddressFunction : public BluetoothExtensionFunction {
};
class BluetoothGetDevicesWithServiceUUIDFunction
- : public BluetoothExtensionFunction {
+ : public SyncExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION_NAME(
"experimental.bluetooth.getDevicesWithServiceUUID")
@@ -93,7 +71,7 @@ class BluetoothGetDevicesWithServiceUUIDFunction
};
class BluetoothGetDevicesWithServiceNameFunction
- : public AsyncBluetoothExtensionFunction {
+ : public AsyncExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION_NAME(
"experimental.bluetooth.getDevicesWithServiceName")
@@ -108,8 +86,8 @@ class BluetoothGetDevicesWithServiceNameFunction
// ExtensionFunction:
virtual bool RunImpl() OVERRIDE;
-#if defined(OS_CHROMEOS)
private:
+#if defined(OS_CHROMEOS)
void AddDeviceIfTrue(
ListValue* list, const chromeos::BluetoothDevice* device, bool result);
@@ -117,7 +95,7 @@ class BluetoothGetDevicesWithServiceNameFunction
#endif
};
-class BluetoothConnectFunction : public AsyncBluetoothExtensionFunction {
+class BluetoothConnectFunction : public AsyncExtensionFunction {
public:
virtual bool RunImpl() OVERRIDE;
DECLARE_EXTENSION_FUNCTION_NAME("experimental.bluetooth.connect")
@@ -131,7 +109,7 @@ class BluetoothConnectFunction : public AsyncBluetoothExtensionFunction {
#endif
};
-class BluetoothDisconnectFunction : public BluetoothExtensionFunction {
+class BluetoothDisconnectFunction : public SyncExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION_NAME("experimental.bluetooth.disconnect")
@@ -142,7 +120,7 @@ class BluetoothDisconnectFunction : public BluetoothExtensionFunction {
virtual bool RunImpl() OVERRIDE;
};
-class BluetoothReadFunction : public BluetoothExtensionFunction {
+class BluetoothReadFunction : public SyncExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION_NAME("experimental.bluetooth.read")
@@ -154,7 +132,7 @@ class BluetoothReadFunction : public BluetoothExtensionFunction {
};
class BluetoothSetOutOfBandPairingDataFunction
- : public BluetoothExtensionFunction {
+ : public SyncExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION_NAME(
"experimental.bluetooth.setOutOfBandPairingData")
@@ -167,7 +145,7 @@ class BluetoothSetOutOfBandPairingDataFunction
};
class BluetoothGetOutOfBandPairingDataFunction
- : public BluetoothExtensionFunction {
+ : public SyncExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION_NAME(
"experimental.bluetooth.getOutOfBandPairingData")
@@ -179,7 +157,7 @@ class BluetoothGetOutOfBandPairingDataFunction
virtual bool RunImpl() OVERRIDE;
};
-class BluetoothWriteFunction : public BluetoothExtensionFunction {
+class BluetoothWriteFunction : public SyncExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION_NAME("experimental.bluetooth.write")
« no previous file with comments | « no previous file | chrome/browser/extensions/api/bluetooth/bluetooth_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698