Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Unified Diff: chrome/browser/resources/settings/internet_page/internet_detail_page.html

Issue 2528803002: MD Settings: Internet: Add/fix remaining policy items (Closed)
Patch Set: . Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 a5d8f57f17612044d255ce121e58e67df1ee1291..54bf31b10fe4b4c5e35ebdf31ab187b37bc2c15a 100644
--- a/chrome/browser/resources/settings/internet_page/internet_detail_page.html
+++ b/chrome/browser/resources/settings/internet_page/internet_detail_page.html
@@ -91,6 +91,13 @@
connected$="[[isConnectedState_(networkProperties)]]">
[[getStateText_(networkProperties)]]
</div>
+ <template is="dom-if"
+ if="[[isPolicySource(networkProperties.Source))]]">
+ <cr-policy-network-indicator
+ indicator-type="[[getIndicatorTypeForSource(
+ networkProperties.Source)]]">
Dan Beam 2016/11/29 05:25:34 indent off, I think we've generally lined these up
stevenjb 2016/11/30 22:58:19 Meh. My editor likes to do it this way. I'm sure w
+ </cr-policy-network-indicator>
+ </template>
</div>
<div id="buttonDiv" class="layout horizontal center">
<paper-button class="secondary-button" on-tap="onForgetTap_"
@@ -133,7 +140,7 @@
<div class="settings-box">
<paper-checkbox checked="{{preferNetwork_}}"
disabled="[[isNetworkPolicyEnforced(
- networkProperties.Priority)]]">
+ networkProperties.Priority)]]">
$i18n{networkPrefer}
</paper-checkbox>
<cr-policy-network-indicator
@@ -144,7 +151,9 @@
<!-- Autoconnect. -->
<template is="dom-if" if="[[showAutoConnect_(networkProperties)]]">
<div class="settings-box">
- <paper-checkbox checked="{{autoConnect_}}">
+ <paper-checkbox checked="{{autoConnect_}}"
+ disabled="[[isNetworkPolicyEnforced(
+ getManagedAutoConnect_(networkProperties))]]">
$i18n{networkAutoConnect}
</paper-checkbox>
<cr-policy-network-indicator

Powered by Google App Engine
This is Rietveld 408576698