summaryrefslogtreecommitdiffstats
path: root/chromeos/network/network_util.h
diff options
context:
space:
mode:
authorstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-07 23:20:19 +0000
committerstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-07 23:20:19 +0000
commit801c8663dacdcaccaf8b01efceb78989c56cba87 (patch)
tree260c1487ecf0fd06308da184059a7ef713f4611d /chromeos/network/network_util.h
parent5d7940e5a22e9c5add18e52cb579729bd98d5002 (diff)
downloadchromium_src-801c8663dacdcaccaf8b01efceb78989c56cba87.zip
chromium_src-801c8663dacdcaccaf8b01efceb78989c56cba87.tar.gz
chromium_src-801c8663dacdcaccaf8b01efceb78989c56cba87.tar.bz2
Replace simple network properties in settings with ONC values
This is step 2 (of many) in converting the network settings to Web UI. This CL passes the ONC dictionary to the network UI, along with additional existing non-ONC properties that require more complicated handling (which will be converted in follow-up CLs). The only functional change is that previously the string "Access to this network is protected" was never shown before due to a typo in JS which was fixed as a renaming side-effect. BUG=279351 R=pneubeck@chromium.org Review URL: https://codereview.chromium.org/367453004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281604 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/network/network_util.h')
-rw-r--r--chromeos/network/network_util.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/chromeos/network/network_util.h b/chromeos/network/network_util.h
index 99707bd..69a9d26 100644
--- a/chromeos/network/network_util.h
+++ b/chromeos/network/network_util.h
@@ -109,6 +109,10 @@ CHROMEOS_EXPORT scoped_ptr<base::ListValue> TranslateNetworkListToONC(
int limit,
bool debugging_properties);
+// Returns the Shill type corresponding to ONC |type| or an empty string if
+// there is no match. Only valid for ethernet, wifi, wimax, cellular, and vpn.
+CHROMEOS_EXPORT std::string TranslateONCTypeToShill(const std::string& type);
+
} // namespace network_util
} // namespace chromeos