OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/wifi/wifi_service.h" | 5 #include "components/wifi/wifi_service.h" |
6 | 6 |
7 #import <CoreWLAN/CoreWLAN.h> | 7 #import <CoreWLAN/CoreWLAN.h> |
8 #import <netinet/in.h> | 8 #import <netinet/in.h> |
9 #import <SystemConfiguration/SystemConfiguration.h> | 9 #import <SystemConfiguration/SystemConfiguration.h> |
10 | 10 |
11 #include <utility> | |
12 | |
11 #include "base/bind.h" | 13 #include "base/bind.h" |
12 #include "base/mac/foundation_util.h" | 14 #include "base/mac/foundation_util.h" |
13 #include "base/mac/scoped_cftyperef.h" | 15 #include "base/mac/scoped_cftyperef.h" |
14 #include "base/mac/scoped_nsobject.h" | 16 #include "base/mac/scoped_nsobject.h" |
15 #include "base/mac/sdk_forward_declarations.h" | 17 #include "base/mac/sdk_forward_declarations.h" |
16 #include "base/macros.h" | 18 #include "base/macros.h" |
17 #include "base/message_loop/message_loop.h" | 19 #include "base/message_loop/message_loop.h" |
jdoerrie
2017/04/12 12:37:46
#include "base/values.h"
vabr (Chromium)
2017/04/12 12:55:04
Done.
| |
18 #include "base/strings/sys_string_conversions.h" | 20 #include "base/strings/sys_string_conversions.h" |
19 #include "components/onc/onc_constants.h" | 21 #include "components/onc/onc_constants.h" |
20 #include "components/wifi/network_properties.h" | 22 #include "components/wifi/network_properties.h" |
21 #include "crypto/apple_keychain.h" | 23 #include "crypto/apple_keychain.h" |
22 | 24 |
23 namespace wifi { | 25 namespace wifi { |
24 | 26 |
25 // Implementation of WiFiService for Mac OS X. | 27 // Implementation of WiFiService for Mac OS X. |
26 class WiFiServiceMac : public WiFiService { | 28 class WiFiServiceMac : public WiFiService { |
27 public: | 29 public: |
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
257 } | 259 } |
258 | 260 |
259 if (networks_.empty()) | 261 if (networks_.empty()) |
260 UpdateNetworks(); | 262 UpdateNetworks(); |
261 | 263 |
262 for (NetworkList::const_iterator it = networks_.begin(); | 264 for (NetworkList::const_iterator it = networks_.begin(); |
263 it != networks_.end(); | 265 it != networks_.end(); |
264 ++it) { | 266 ++it) { |
265 std::unique_ptr<base::DictionaryValue> network( | 267 std::unique_ptr<base::DictionaryValue> network( |
266 it->ToValue(!include_details)); | 268 it->ToValue(!include_details)); |
267 network_list->Append(network.release()); | 269 network_list->Append(std::move(network)); |
268 } | 270 } |
269 } | 271 } |
270 | 272 |
271 void WiFiServiceMac::RequestNetworkScan() { | 273 void WiFiServiceMac::RequestNetworkScan() { |
272 DVLOG(1) << "*** RequestNetworkScan"; | 274 DVLOG(1) << "*** RequestNetworkScan"; |
273 UpdateNetworks(); | 275 UpdateNetworks(); |
274 } | 276 } |
275 | 277 |
276 void WiFiServiceMac::StartConnect(const std::string& network_guid, | 278 void WiFiServiceMac::StartConnect(const std::string& network_guid, |
277 std::string* error) { | 279 std::string* error) { |
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
614 DVLOG(1) << "NotifyNetworkChanged: " << network_guid; | 616 DVLOG(1) << "NotifyNetworkChanged: " << network_guid; |
615 NetworkGuidList changed_networks(1, network_guid); | 617 NetworkGuidList changed_networks(1, network_guid); |
616 event_task_runner_->PostTask( | 618 event_task_runner_->PostTask( |
617 FROM_HERE, base::Bind(networks_changed_observer_, changed_networks)); | 619 FROM_HERE, base::Bind(networks_changed_observer_, changed_networks)); |
618 } | 620 } |
619 | 621 |
620 // static | 622 // static |
621 WiFiService* WiFiService::Create() { return new WiFiServiceMac(); } | 623 WiFiService* WiFiService::Create() { return new WiFiServiceMac(); } |
622 | 624 |
623 } // namespace wifi | 625 } // namespace wifi |
OLD | NEW |