Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_ | 5 #ifndef CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_ |
| 6 #define CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_ | 6 #define CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 235 const std::string& GetCheckPortalListForTest() const { | 235 const std::string& GetCheckPortalListForTest() const { |
| 236 return check_portal_list_; | 236 return check_portal_list_; |
| 237 } | 237 } |
| 238 | 238 |
| 239 // Returns the FavoriteState of the EthernetEAP service, which contains the | 239 // Returns the FavoriteState of the EthernetEAP service, which contains the |
| 240 // EAP parameters used by the ethernet with |service_path|. If |service_path| | 240 // EAP parameters used by the ethernet with |service_path|. If |service_path| |
| 241 // doesn't refer to an ethernet service or if the ethernet service is not | 241 // doesn't refer to an ethernet service or if the ethernet service is not |
| 242 // connected using EAP, returns NULL. | 242 // connected using EAP, returns NULL. |
| 243 const FavoriteState* GetEAPForEthernet(const std::string& service_path) const; | 243 const FavoriteState* GetEAPForEthernet(const std::string& service_path) const; |
| 244 | 244 |
| 245 const std::string& default_network_path() const { | |
|
pneubeck (no reviews)
2014/06/06 20:04:24
equivalent to DefaultNetwork()->path() ?
might be
stevenjb
2014/06/06 20:06:12
It's not quite, because DefaultNetwork() might be
| |
| 246 return default_network_path_; | |
| 247 } | |
| 248 | |
| 245 // Construct and initialize an instance for testing. | 249 // Construct and initialize an instance for testing. |
| 246 static NetworkStateHandler* InitializeForTest(); | 250 static NetworkStateHandler* InitializeForTest(); |
| 247 | 251 |
| 248 // Default set of comma separated interfaces on which to enable | 252 // Default set of comma separated interfaces on which to enable |
| 249 // portal checking. | 253 // portal checking. |
| 250 static const char kDefaultCheckPortalList[]; | 254 static const char kDefaultCheckPortalList[]; |
| 251 | 255 |
| 252 protected: | 256 protected: |
| 253 friend class NetworkHandler; | 257 friend class NetworkHandler; |
| 254 NetworkStateHandler(); | 258 NetworkStateHandler(); |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 397 // Map of network specifiers to guids. Contains an entry for each | 401 // Map of network specifiers to guids. Contains an entry for each |
| 398 // FavoriteState that is not saved in a profile. | 402 // FavoriteState that is not saved in a profile. |
| 399 SpecifierGuidMap specifier_guid_map_; | 403 SpecifierGuidMap specifier_guid_map_; |
| 400 | 404 |
| 401 DISALLOW_COPY_AND_ASSIGN(NetworkStateHandler); | 405 DISALLOW_COPY_AND_ASSIGN(NetworkStateHandler); |
| 402 }; | 406 }; |
| 403 | 407 |
| 404 } // namespace chromeos | 408 } // namespace chromeos |
| 405 | 409 |
| 406 #endif // CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_ | 410 #endif // CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_ |
| OLD | NEW |