Commit 192ad7eb authored by horo@chromium.org's avatar horo@chromium.org

Revert 282286 "Expose "visible" and "authenticated" properties."

We need to revert r282212 which breaks XP tests.
> Expose "visible" and "authenticated" properties.
> 
> They are always "true" for now, due to the way BLE devices work under Windows 8.
> 
> BUG=388016
> 
> Review URL: https://codereview.chromium.org/378293007

TBR=rpaquay@chromium.org

Review URL: https://codereview.chromium.org/388453003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282294 0039d316-1c4b-4281-b951-d872f2087c98
parent 254a4722
...@@ -322,11 +322,6 @@ bool CollectBluetoothLowEnergyDeviceStatus( ...@@ -322,11 +322,6 @@ bool CollectBluetoothLowEnergyDeviceStatus(
} }
device_info->connected = !(value->AsUint32() & DN_DEVICE_DISCONNECTED); device_info->connected = !(value->AsUint32() & DN_DEVICE_DISCONNECTED);
// Windows 8 exposes BLE devices only if they are visible and paired. This
// might change in the future if Windows offers a public API for discovering
// and pairing BLE devices.
device_info->visible = true;
device_info->authenticated = true;
return true; return true;
} }
...@@ -524,7 +519,7 @@ uint32_t DevicePropertyValue::AsUint32() const { ...@@ -524,7 +519,7 @@ uint32_t DevicePropertyValue::AsUint32() const {
} }
BluetoothLowEnergyDeviceInfo::BluetoothLowEnergyDeviceInfo() BluetoothLowEnergyDeviceInfo::BluetoothLowEnergyDeviceInfo()
: visible(false), authenticated(false), connected(false) { : connected(false) {
address.ullLong = BLUETOOTH_NULL_ADDRESS; address.ullLong = BLUETOOTH_NULL_ADDRESS;
} }
......
...@@ -113,8 +113,6 @@ struct BluetoothLowEnergyDeviceInfo { ...@@ -113,8 +113,6 @@ struct BluetoothLowEnergyDeviceInfo {
std::string id; std::string id;
std::string friendly_name; std::string friendly_name;
BLUETOOTH_ADDRESS address; BLUETOOTH_ADDRESS address;
bool visible;
bool authenticated;
bool connected; bool connected;
}; };
......
...@@ -406,10 +406,7 @@ void BluetoothTaskManagerWin::GetKnownDevices() { ...@@ -406,10 +406,7 @@ void BluetoothTaskManagerWin::GetKnownDevices() {
DeviceState* device_state = new DeviceState(); DeviceState* device_state = new DeviceState();
device_state->name = device_info->friendly_name; device_state->name = device_info->friendly_name;
device_state->address = BluetoothAddressToString(device_info->address); device_state->address = BluetoothAddressToString(device_info->address);
device_state->visible = device_info->visible;
device_state->authenticated = device_info->authenticated;
device_state->connected = device_info->connected; device_state->connected = device_info->connected;
device_state->path = device_info->path;
device_list->push_back(device_state); device_list->push_back(device_state);
} }
} }
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "base/files/file_path.h"
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "base/memory/scoped_vector.h" #include "base/memory/scoped_vector.h"
#include "base/observer_list.h" #include "base/observer_list.h"
...@@ -54,17 +53,13 @@ class BluetoothTaskManagerWin ...@@ -54,17 +53,13 @@ class BluetoothTaskManagerWin
struct DeviceState { struct DeviceState {
DeviceState(); DeviceState();
~DeviceState(); ~DeviceState();
// Properties common to Bluetooth Radio and LE devices.
std::string name; std::string name;
std::string address; std::string address;
uint32 bluetooth_class;
bool visible; bool visible;
bool connected; bool connected;
bool authenticated; bool authenticated;
ScopedVector<ServiceRecordState> service_record_states; ScopedVector<ServiceRecordState> service_record_states;
// Properties specific to Bluetooth Radio devices.
uint32 bluetooth_class;
// Properties specific to Bluetooth LE devices.
base::FilePath path;
}; };
class Observer { class Observer {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment