diff options
author | meacer <meacer@chromium.org> | 2015-01-30 13:15:44 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-30 21:16:54 +0000 |
commit | 4770e8a571858a672cae59a4b818244df4520ac1 (patch) | |
tree | 5efecbd81af385a32cfe58428da392bfe75f74af /components/wifi/wifi_test.cc | |
parent | 983206f104e5495e5a126356ce8a0d965d8c6f1f (diff) | |
download | chromium_src-4770e8a571858a672cae59a4b818244df4520ac1.zip chromium_src-4770e8a571858a672cae59a4b818244df4520ac1.tar.gz chromium_src-4770e8a571858a672cae59a4b818244df4520ac1.tar.bz2 |
Add SSID getter to WiFiService.
The SSID is going to be displayed in the captive portal interstitial as such: "The network you are using (Google Guest)..."
BUG=451272
Review URL: https://codereview.chromium.org/880143003
Cr-Commit-Position: refs/heads/master@{#313995}
Diffstat (limited to 'components/wifi/wifi_test.cc')
-rw-r--r-- | components/wifi/wifi_test.cc | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/components/wifi/wifi_test.cc b/components/wifi/wifi_test.cc index 2fa07c3..47d1940 100644 --- a/components/wifi/wifi_test.cc +++ b/components/wifi/wifi_test.cc @@ -82,19 +82,20 @@ class WiFiTest { WiFiTest::Result WiFiTest::Main(int argc, const char* argv[]) { if (!ParseCommandLine(argc, argv)) { - VLOG(0) << "Usage: " << argv[0] << - " [--list]" - " [--get_key]" - " [--get_properties]" - " [--create]" - " [--connect]" - " [--disconnect]" - " [--scan]" - " [--network_guid=<network_guid>]" - " [--frequency=0|2400|5000]" - " [--security=none|WEP-PSK|WPA-PSK|WPA2-PSK]" - " [--password=<wifi_password>]" - " [<network_guid>]\n"; + VLOG(0) << "Usage: " << argv[0] + << " [--list]" + " [--get_connected_ssid]" + " [--get_key]" + " [--get_properties]" + " [--create]" + " [--connect]" + " [--disconnect]" + " [--scan]" + " [--network_guid=<network_guid>]" + " [--frequency=0|2400|5000]" + " [--security=none|WEP-PSK|WPA-PSK|WPA2-PSK]" + " [--password=<wifi_password>]" + " [<network_guid>]\n"; return RESULT_WRONG_USAGE; } @@ -232,6 +233,17 @@ bool WiFiTest::ParseCommandLine(int argc, const char* argv[]) { return true; } + if (parsed_command_line.HasSwitch("get_connected_ssid")) { + std::string ssid; + std::string error; + wifi_service_->GetConnectedNetworkSSID(&ssid, &error); + if (error.length() > 0) + VLOG(0) << error; + else + VLOG(0) << "Network SSID: " << ssid; + return true; + } + return false; } |