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

Side by Side Diff: components/wifi/wifi_test.cc

Issue 880143003: Add SSID getter to WiFiService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use ssid instead of guid Created 5 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stdio.h> 5 #include <stdio.h>
6 #include <string> 6 #include <string>
7 7
8 #include "base/at_exit.h" 8 #include "base/at_exit.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/cancelable_callback.h" 10 #include "base/cancelable_callback.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 scoped_ptr<WiFiService> wifi_service_; 75 scoped_ptr<WiFiService> wifi_service_;
76 76
77 // Need AtExitManager to support AsWeakPtr (in NetLog). 77 // Need AtExitManager to support AsWeakPtr (in NetLog).
78 base::AtExitManager exit_manager_; 78 base::AtExitManager exit_manager_;
79 79
80 Result result_; 80 Result result_;
81 }; 81 };
82 82
83 WiFiTest::Result WiFiTest::Main(int argc, const char* argv[]) { 83 WiFiTest::Result WiFiTest::Main(int argc, const char* argv[]) {
84 if (!ParseCommandLine(argc, argv)) { 84 if (!ParseCommandLine(argc, argv)) {
85 VLOG(0) << "Usage: " << argv[0] << 85 VLOG(0) << "Usage: " << argv[0]
86 " [--list]" 86 << " [--list]"
87 " [--get_key]" 87 " [--get_connected_ssid]"
88 " [--get_properties]" 88 " [--get_key]"
89 " [--create]" 89 " [--get_properties]"
90 " [--connect]" 90 " [--create]"
91 " [--disconnect]" 91 " [--connect]"
92 " [--scan]" 92 " [--disconnect]"
93 " [--network_guid=<network_guid>]" 93 " [--scan]"
94 " [--frequency=0|2400|5000]" 94 " [--network_guid=<network_guid>]"
95 " [--security=none|WEP-PSK|WPA-PSK|WPA2-PSK]" 95 " [--frequency=0|2400|5000]"
96 " [--password=<wifi_password>]" 96 " [--security=none|WEP-PSK|WPA-PSK|WPA2-PSK]"
97 " [<network_guid>]\n"; 97 " [--password=<wifi_password>]"
98 " [<network_guid>]\n";
98 return RESULT_WRONG_USAGE; 99 return RESULT_WRONG_USAGE;
99 } 100 }
100 101
101 base::MessageLoopForIO loop; 102 base::MessageLoopForIO loop;
102 result_ = RESULT_PENDING; 103 result_ = RESULT_PENDING;
103 104
104 return result_; 105 return result_;
105 } 106 }
106 107
107 bool WiFiTest::ParseCommandLine(int argc, const char* argv[]) { 108 bool WiFiTest::ParseCommandLine(int argc, const char* argv[]) {
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 if (parsed_command_line.HasSwitch("scan")) { 226 if (parsed_command_line.HasSwitch("scan")) {
226 wifi_service_->SetEventObservers( 227 wifi_service_->SetEventObservers(
227 loop.message_loop_proxy(), 228 loop.message_loop_proxy(),
228 base::Bind(&WiFiTest::OnNetworksChanged, base::Unretained(this)), 229 base::Bind(&WiFiTest::OnNetworksChanged, base::Unretained(this)),
229 base::Bind(&WiFiTest::OnNetworkListChanged, base::Unretained(this))); 230 base::Bind(&WiFiTest::OnNetworkListChanged, base::Unretained(this)));
230 wifi_service_->RequestNetworkScan(); 231 wifi_service_->RequestNetworkScan();
231 base::MessageLoop::current()->Run(); 232 base::MessageLoop::current()->Run();
232 return true; 233 return true;
233 } 234 }
234 235
236 if (parsed_command_line.HasSwitch("get_connected_ssid")) {
237 std::string ssid;
238 std::string error;
239 wifi_service_->GetConnectedNetworkSSID(&ssid, &error);
240 if (error.length() > 0)
241 VLOG(0) << error;
242 else
243 VLOG(0) << "Network SSID: " << ssid;
244 return true;
245 }
246
235 return false; 247 return false;
236 } 248 }
237 249
238 } // namespace wifi 250 } // namespace wifi
239 251
240 int main(int argc, const char* argv[]) { 252 int main(int argc, const char* argv[]) {
241 base::CommandLine::Init(argc, argv); 253 base::CommandLine::Init(argc, argv);
242 logging::LoggingSettings settings; 254 logging::LoggingSettings settings;
243 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; 255 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
244 logging::InitLogging(settings); 256 logging::InitLogging(settings);
245 257
246 wifi::WiFiTest wifi_test; 258 wifi::WiFiTest wifi_test;
247 return wifi_test.Main(argc, argv); 259 return wifi_test.Main(argc, argv);
248 } 260 }
OLDNEW
« components/wifi/wifi_service_win.cc ('K') | « components/wifi/wifi_service_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698