Index: chrome/browser/resources/settings/internet_page/internet_detail_page.html |
diff --git a/chrome/browser/resources/settings/internet_page/internet_detail_page.html b/chrome/browser/resources/settings/internet_page/internet_detail_page.html |
index 9cd13af4ef609a1de8dc8544eead233f1d35b4f3..edf8056ac5faa546cf4fc5dda60410e330b38fc4 100644 |
--- a/chrome/browser/resources/settings/internet_page/internet_detail_page.html |
+++ b/chrome/browser/resources/settings/internet_page/internet_detail_page.html |
@@ -8,6 +8,8 @@ |
<link rel="import" href="chrome://resources/cr_elements/v1_0/cr_expand_button/cr_expand_button.html"> |
<link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_network_icon.html"> |
<link rel="import" href="chrome://resources/cr_elements/v1_0/network/cr_onc_types.html"> |
+<link rel="import" href="chrome://resources/cr_elements/v1_0/policy/cr_policy_network_behavior.html"> |
+<link rel="import" href="chrome://resources/cr_elements/v1_0/policy/cr_policy_network_indicator.html"> |
<link rel="import" href="network_apnlist.html"> |
<link rel="import" href="network_ip_config.html"> |
<link rel="import" href="network_nameservers.html"> |
@@ -49,18 +51,28 @@ |
<span hidden$="[[!showShared_(networkProperties)]]"> |
This network is shared with other users. |
</span> |
- <div class="layout horizontal center" |
+ <div class="control layout horizontal center" |
hidden$="[[!showPreferNetwork_(networkProperties)]]"> |
- <paper-icon-button id="preferButton" |
- toggles active="{{preferNetwork}}" |
+ <paper-icon-button id="preferButton" toggles |
+ active="{{preferNetwork}}" |
+ disabled= |
+ "[[isNetworkPolicyEnforced(networkProperties.Priority)]]" |
icon="[[getPreferredIcon_(preferNetwork)]]"> |
</paper-icon-button> |
<span>Prefer this network</span> |
+ <cr-policy-network-indicator |
+ property="[[networkProperties.Priority]]"> |
+ </cr-policy-network-indicator> |
</div> |
- <paper-checkbox checked="{{autoConnect}}" |
+ <div class="control layout horizontal center" |
hidden$="[[!showAutoConnect_(networkProperties)]]"> |
- Automatically connect to this network |
- </paper-checkbox> |
+ <paper-checkbox checked="{{autoConnect}}"> |
+ Automatically connect to this network |
+ </paper-checkbox> |
+ <cr-policy-network-indicator |
+ property="[[getManagedAutoConnect_(networkProperties)]]"> |
+ </cr-policy-network-indicator> |
+ </div> |
<!-- Properties to always show if present. --> |
<network-property-list |