Commit 24e0812a authored by stevenjb@chromium.org's avatar stevenjb@chromium.org

Support Managed NetworkState format dictionaries for controlled settings.

BUG=279351

Review URL: https://codereview.chromium.org/427903004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288145 0039d316-1c4b-4281-b951-d872f2087c98
parent 40a16f97
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
i18n-content="inetAutoConnectNetwork"> i18n-content="inetAutoConnectNetwork">
</label> </label>
<span class="controlled-setting-indicator" <span class="controlled-setting-indicator"
data="autoConnect" for="auto-connect-network-wifi"> managed="AutoConnect" for="auto-connect-network-wifi">
</span> </span>
</span> </span>
</span> </span>
...@@ -114,22 +114,6 @@ ...@@ -114,22 +114,6 @@
<td class="option-name" i18n-content="inetBssid"></td> <td class="option-name" i18n-content="inetBssid"></td>
<td id="wifi-bssid" class="option-value"></td> <td id="wifi-bssid" class="option-value"></td>
</tr> </tr>
<tr class="wifi-network-setting">
<td class="option-name" i18n-content="inetAddress"></td>
<td id="wifi-ip-address" class="option-value"></td>
</tr>
<tr class="wifi-network-setting">
<td class="option-name" i18n-content="inetNetmask"></td>
<td id="wifi-netmask" class="option-value"></td>
</tr>
<tr class="wifi-network-setting">
<td class="option-name" i18n-content="inetGateway"></td>
<td id="wifi-gateway" class="option-value"></td>
</tr>
<tr class="wifi-network-setting">
<td class="option-name" i18n-content="inetNameServers"></td>
<td id="wifi-name-servers" class="option-value"></td>
</tr>
<tr id="wifi-security-entry"> <tr id="wifi-security-entry">
<td class="options-name" i18n-content="inetEncryption"></td> <td class="options-name" i18n-content="inetEncryption"></td>
<td id="wifi-security" class="option-value"></td> <td id="wifi-security" class="option-value"></td>
...@@ -176,7 +160,7 @@ ...@@ -176,7 +160,7 @@
i18n-content="inetAutoConnectNetwork"> i18n-content="inetAutoConnectNetwork">
</label> </label>
<span class="controlled-setting-indicator" <span class="controlled-setting-indicator"
data="autoConnect" for="auto-connect-network-wimax"> managed="AutoConnect" for="auto-connect-network-wimax">
</span> </span>
</span> </span>
</span> </span>
...@@ -224,7 +208,7 @@ ...@@ -224,7 +208,7 @@
i18n-content="inetAutoConnectNetwork"> i18n-content="inetAutoConnectNetwork">
</label> </label>
<span class="controlled-setting-indicator" <span class="controlled-setting-indicator"
data="autoConnect" for="auto-connect-network-vpn"> managed="AutoConnect" for="auto-connect-network-vpn">
</span> </span>
</span> </span>
</span> </span>
...@@ -344,7 +328,8 @@ ...@@ -344,7 +328,8 @@
i18n-content="inetAutoConnectNetwork"> i18n-content="inetAutoConnectNetwork">
</label> </label>
<span class="controlled-setting-indicator" <span class="controlled-setting-indicator"
data="autoConnect" for="auto-connect-network-cellular"> managed="AutoConnect"
for="auto-connect-network-cellular">
</span> </span>
</span> </span>
</span> </span>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment