summaryrefslogtreecommitdiffstats
path: root/device/bluetooth/bluetooth_task_manager_win.h
diff options
context:
space:
mode:
authorscheib <scheib@chromium.org>2014-12-05 14:32:34 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-05 22:32:57 +0000
commit9f5b566d896d34380642c952041bfd30eb315385 (patch)
treea6ecbffe985e6000d77f91327ab36a32aa6df740 /device/bluetooth/bluetooth_task_manager_win.h
parentd885a6855fb022b204f4cfb33cec73a71bd889f3 (diff)
downloadchromium_src-9f5b566d896d34380642c952041bfd30eb315385.zip
chromium_src-9f5b566d896d34380642c952041bfd30eb315385.tar.gz
chromium_src-9f5b566d896d34380642c952041bfd30eb315385.tar.bz2
Revert of bluetooth: Make device/bluetooth a shared library component. (patchset #4 id:100001 of https://codereview.chromium.org/778443002/)
Reason for revert: Chrome target is failing to load due to BluetoothApis.dll not being found on Win7. Likely the DelayLoadDLLs for BluetoothApis.dll is necessary on more than just device_bluetooth. Original issue's description: > bluetooth: Make device/bluetooth a shared library component. > > device/bluetooth will soon be accessed by content/browser. This > change converts it from a static library to a shared component. > > BUG=438305 > > Committed: https://crrev.com/ff6eaf5adf4d6dc5a748e2ee4e8de080655d1975 > Cr-Commit-Position: refs/heads/master@{#307049} TBR=armansito@chromium.org,isherman@chromium.org,benchan@chromium.org NOTREECHECKS=true NOTRY=true BUG=438305 Review URL: https://codereview.chromium.org/748873004 Cr-Commit-Position: refs/heads/master@{#307098}
Diffstat (limited to 'device/bluetooth/bluetooth_task_manager_win.h')
-rw-r--r--device/bluetooth/bluetooth_task_manager_win.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/device/bluetooth/bluetooth_task_manager_win.h b/device/bluetooth/bluetooth_task_manager_win.h
index e8b7ae6..2beda13 100644
--- a/device/bluetooth/bluetooth_task_manager_win.h
+++ b/device/bluetooth/bluetooth_task_manager_win.h
@@ -14,7 +14,6 @@
#include "base/observer_list.h"
#include "base/win/scoped_handle.h"
#include "device/bluetooth/bluetooth_adapter.h"
-#include "device/bluetooth/bluetooth_export.h"
namespace base {
@@ -33,10 +32,10 @@ namespace device {
// It delegates the blocking Windows API calls to |bluetooth_task_runner_|'s
// message loop, and receives responses via methods like OnAdapterStateChanged
// posted to UI thread.
-class DEVICE_BLUETOOTH_EXPORT BluetoothTaskManagerWin
+class BluetoothTaskManagerWin
: public base::RefCountedThreadSafe<BluetoothTaskManagerWin> {
public:
- struct DEVICE_BLUETOOTH_EXPORT AdapterState {
+ struct AdapterState {
AdapterState();
~AdapterState();
std::string name;
@@ -44,7 +43,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothTaskManagerWin
bool powered;
};
- struct DEVICE_BLUETOOTH_EXPORT ServiceRecordState {
+ struct ServiceRecordState {
ServiceRecordState();
~ServiceRecordState();
// Properties common to Bluetooth Classic and LE devices.
@@ -55,7 +54,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothTaskManagerWin
BluetoothUUID gatt_uuid;
};
- struct DEVICE_BLUETOOTH_EXPORT DeviceState {
+ struct DeviceState {
DeviceState();
~DeviceState();
@@ -74,7 +73,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothTaskManagerWin
base::FilePath path;
};
- class DEVICE_BLUETOOTH_EXPORT Observer {
+ class Observer {
public:
virtual ~Observer() {}