| 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_UTIL_H_ | 5 #ifndef CHROMEOS_NETWORK_NETWORK_UTIL_H_ |
| 6 #define CHROMEOS_NETWORK_NETWORK_UTIL_H_ | 6 #define CHROMEOS_NETWORK_NETWORK_UTIL_H_ |
| 7 | 7 |
| 8 // This header is introduced to make it easy to switch from chromeos_network.cc | 8 // This header is introduced to make it easy to switch from chromeos_network.cc |
| 9 // to Chrome's own DBus code. crosbug.com/16557 | 9 // to Chrome's own DBus code. crosbug.com/16557 |
| 10 // All calls to functions in chromeos_network.h should be made through | 10 // All calls to functions in chromeos_network.h should be made through |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 const std::string& shill_mac_address); | 86 const std::string& shill_mac_address); |
| 87 | 87 |
| 88 // Parses |list|, which contains DictionaryValues and returns a vector of | 88 // Parses |list|, which contains DictionaryValues and returns a vector of |
| 89 // CellularScanResult in |scan_results|. Returns false if parsing fails, | 89 // CellularScanResult in |scan_results|. Returns false if parsing fails, |
| 90 // in which case the contents of |scan_results| will be undefined. | 90 // in which case the contents of |scan_results| will be undefined. |
| 91 CHROMEOS_EXPORT bool ParseCellularScanResults( | 91 CHROMEOS_EXPORT bool ParseCellularScanResults( |
| 92 const base::ListValue& list, std::vector<CellularScanResult>* scan_results); | 92 const base::ListValue& list, std::vector<CellularScanResult>* scan_results); |
| 93 | 93 |
| 94 // Retrieves the ONC state dictionary for |network| using GetStateProperties. | 94 // Retrieves the ONC state dictionary for |network| using GetStateProperties. |
| 95 // This includes properties from the corresponding NetworkState if it exists. | 95 // This includes properties from the corresponding NetworkState if it exists. |
| 96 // Assumed to be called from the primary user profile. |
| 96 CHROMEOS_EXPORT scoped_ptr<base::DictionaryValue> TranslateNetworkStateToONC( | 97 CHROMEOS_EXPORT scoped_ptr<base::DictionaryValue> TranslateNetworkStateToONC( |
| 97 const NetworkState* network); | 98 const NetworkState* network); |
| 98 | 99 |
| 99 // Retrieves the list of network services by passing |pattern|, | 100 // Retrieves the list of network services by passing |pattern|, |
| 100 // |configured_only|, and |visible_only| to NetworkStateHandler:: | 101 // |configured_only|, and |visible_only| to NetworkStateHandler:: |
| 101 // GetNetworkListByType(). Translates the result into a list of ONC | 102 // GetNetworkListByType(). Translates the result into a list of ONC |
| 102 // dictionaries using TranslateShillServiceToONCPart. |limit| is used to limit | 103 // dictionaries using TranslateShillServiceToONCPart. |limit| is used to limit |
| 103 // the number of results. If |debugging_properties| is true then also include | 104 // the number of results. If |debugging_properties| is true then also include |
| 104 // additional debugging properties (used in release code for chrome://network). | 105 // additional debugging properties (used in release code for chrome://network). |
| 105 CHROMEOS_EXPORT scoped_ptr<base::ListValue> TranslateNetworkListToONC( | 106 CHROMEOS_EXPORT scoped_ptr<base::ListValue> TranslateNetworkListToONC( |
| 106 NetworkTypePattern pattern, | 107 NetworkTypePattern pattern, |
| 107 bool configured_only, | 108 bool configured_only, |
| 108 bool visible_only, | 109 bool visible_only, |
| 109 int limit, | 110 int limit, |
| 110 bool debugging_properties); | 111 bool debugging_properties); |
| 111 | 112 |
| 112 // Returns the Shill type corresponding to ONC |type| or an empty string if | 113 // Returns the Shill type corresponding to ONC |type| or an empty string if |
| 113 // there is no match. Only valid for ethernet, wifi, wimax, cellular, and vpn. | 114 // there is no match. Only valid for ethernet, wifi, wimax, cellular, and vpn. |
| 114 CHROMEOS_EXPORT std::string TranslateONCTypeToShill(const std::string& type); | 115 CHROMEOS_EXPORT std::string TranslateONCTypeToShill(const std::string& type); |
| 115 | 116 |
| 116 } // namespace network_util | 117 } // namespace network_util |
| 117 } // namespace chromeos | 118 } // namespace chromeos |
| 118 | 119 |
| 119 #endif // CHROMEOS_NETWORK_NETWORK_UTIL_H_ | 120 #endif // CHROMEOS_NETWORK_NETWORK_UTIL_H_ |
| OLD | NEW |