diff options
author | noamsml@chromium.org <noamsml@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-04 08:41:22 +0000 |
---|---|---|
committer | noamsml@chromium.org <noamsml@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-04 08:41:22 +0000 |
commit | ca11059ee2dd9abe0c64b47cda1f58d6c662e855 (patch) | |
tree | 16daa9bbc8d59d1f9f9c9affb9ea28f487918431 /components/wifi/wifi_service_win.cc | |
parent | a4af7d5f79be09c03b36d86964500195aec4fc70 (diff) | |
download | chromium_src-ca11059ee2dd9abe0c64b47cda1f58d6c662e855.zip chromium_src-ca11059ee2dd9abe0c64b47cda1f58d6c662e855.tar.gz chromium_src-ca11059ee2dd9abe0c64b47cda1f58d6c662e855.tar.bz2 |
This is a library for Windows and MacOSX (tested MacOSX currently) that supports the features needed to do WiFi bootstrapping.
BUG=370071
Review URL: https://codereview.chromium.org/226883002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274731 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/wifi/wifi_service_win.cc')
-rw-r--r-- | components/wifi/wifi_service_win.cc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/components/wifi/wifi_service_win.cc b/components/wifi/wifi_service_win.cc index fe9f7d0..47cb000 100644 --- a/components/wifi/wifi_service_win.cc +++ b/components/wifi/wifi_service_win.cc @@ -21,6 +21,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/win/registry.h" #include "components/onc/onc_constants.h" +#include "components/wifi/network_properties.h" #include "third_party/libxml/chromium/libxml_utils.h" namespace { @@ -203,7 +204,8 @@ class WiFiServiceImpl : public WiFiService { std::string* error) OVERRIDE; virtual void GetVisibleNetworks(const std::string& network_type, - base::ListValue* network_list) OVERRIDE; + base::ListValue* network_list, + bool include_details) OVERRIDE; virtual void RequestNetworkScan() OVERRIDE; @@ -581,7 +583,7 @@ void WiFiServiceImpl::CreateNetwork( if (CheckError(error_code, kErrorWiFiService, error)) return; - WiFiService::NetworkProperties network_properties; + NetworkProperties network_properties; if (!network_properties.UpdateFromValue(*properties)) { CheckError(ERROR_INVALID_DATA, kErrorWiFiService, error); return; @@ -623,7 +625,8 @@ void WiFiServiceImpl::CreateNetwork( } void WiFiServiceImpl::GetVisibleNetworks(const std::string& network_type, - base::ListValue* network_list) { + base::ListValue* network_list, + bool include_details) { if (!network_type.empty() && network_type != onc::network_type::kAllTypes && network_type != onc::network_type::kWiFi) { @@ -636,10 +639,11 @@ void WiFiServiceImpl::GetVisibleNetworks(const std::string& network_type, error = GetVisibleNetworkList(&networks); if (error == ERROR_SUCCESS && !networks.empty()) { SortNetworks(&networks); - for (WiFiService::NetworkList::const_iterator it = networks.begin(); + for (NetworkList::const_iterator it = networks.begin(); it != networks.end(); ++it) { - scoped_ptr<base::DictionaryValue> network(it->ToValue(true)); + scoped_ptr<base::DictionaryValue> network( + it->ToValue(!include_details)); network_list->Append(network.release()); } } @@ -936,7 +940,7 @@ bool WiFiServiceImpl::CheckError(DWORD error_code, return false; } -WiFiService::NetworkList::iterator WiFiServiceImpl::FindNetwork( +NetworkList::iterator WiFiServiceImpl::FindNetwork( NetworkList& networks, const std::string& network_guid) { for (NetworkList::iterator it = networks.begin(); it != networks.end(); @@ -1457,7 +1461,7 @@ DWORD WiFiServiceImpl::GetCurrentProperties(NetworkProperties* properties) { return error; } -WiFiService::Frequency WiFiServiceImpl::GetFrequencyToConnect( +Frequency WiFiServiceImpl::GetFrequencyToConnect( const std::string& network_guid) const { // Check whether desired frequency is set in |connect_properties_|. const base::DictionaryValue* properties; @@ -1553,8 +1557,7 @@ DWORD WiFiServiceImpl::GetDesiredBssList( return error; } -WiFiService::Frequency WiFiServiceImpl::GetNormalizedFrequency( - int frequency_in_mhz) const { +Frequency WiFiServiceImpl::GetNormalizedFrequency(int frequency_in_mhz) const { if (frequency_in_mhz == 0) return kFrequencyAny; if (frequency_in_mhz < 3000) |