MD Settings: Internet: Add/fix remaining policy items

chrome/browser/resources/settings/internet_page/network_proxy.html

Index: chrome/browser/resources/settings/internet_page/network_proxy.html
diff --git a/chrome/browser/resources/settings/internet_page/network_proxy.html b/chrome/browser/resources/settings/internet_page/network_proxy.html
index 56b59a1f9506f77a5ab708f96b212dacabcd0fc3..8ae7edebf5e05908d21a02ed93d16499d17a517d 100644
--- a/chrome/browser/resources/settings/internet_page/network_proxy.html
+++ b/chrome/browser/resources/settings/internet_page/network_proxy.html
@@ -2,7 +2,6 @@
 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.html">
 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_behavior.html">
 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_network_indicator.html">
-<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_indicator.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/html/md_select_css.html">
 <link rel="import" href="chrome://resources/html/polymer.html">
@@ -10,6 +9,7 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input-container.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html">
+<link rel="import" href="/controls/extension_controlled_indicator.html">
 <link rel="import" href="/controls/settings_checkbox.html">
 <link rel="import" href="/i18n_setup.html">
 <link rel="import" href="/prefs/prefs_behavior.html">
@@ -21,11 +21,15 @@
 <dom-module id="network-proxy">
   <template>
     <style include="internet-shared md-select">
-      cr-policy-network-indicator,
-      cr-policy-pref-indicator {
+      cr-policy-network-indicator {
         -webkit-margin-end: 10px;
       }
 
+      extension-controlled-indicator {
+        -webkit-margin-start: 0;
+        width: 100%;
+      }
+
       network-proxy-input {
         margin-bottom: 10px;
       }
@@ -35,10 +39,6 @@
         flex: none;
       }
 
-      .settings-box.indent {
-        @apply(--settings-list-frame-padding);
-      }
-
       #exceptionsDiv {
         padding: 10px 0;
       }
@@ -54,20 +54,21 @@
 
     <!-- Policy indicator -->
     <div class="settings-box first single-column"
-        hidden$="[[!isControlled(networkProperties.ProxySettings.Type)]]">
-      <div class="layout horizontal center"
-          hidden$="[[!getShowNetworkPolicyIndicator_(networkProperties)]]">
+        hidden$="[[!getShowNetworkPolicyIndicator_(networkProperties)]]">
+      <div class="layout horizontal center">
         <cr-policy-network-indicator
             property="[[networkProperties.ProxySettings.Type]]">
         </cr-policy-network-indicator>
         <div>$i18n{networkProxyEnforcedPolicy}</div>
       </div>
-      <div class="layout horizontal center"
-          hidden$="[[!getShowPrefPolicyIndicator_(networkProperties)]]">
-        <cr-policy-pref-indicator pref="[[prefs.proxy]]">
-        </cr-policy-pref-indicator>
-        <div>$i18n{networkProxyControlledExtension}</div>
-      </div>
+    </div>
+    <div class="settings-box first single-column"

[Dan Beam, 2016/11/29 05:25:34]

why does this go into a new settings-box?  doesn't that add a border?  that's
not what we want, no?

[stevenjb, 2016/11/30 22:58:19]

Only one or the other will be shown. Also, 'first' or 'continuation' hides the
border. I'll use 'continuation for both of these to match 'Allow shared
proxies'.

+        hidden$="[[!getShowExtensionPolicyIndicator_(networkProperties)]]">

[Dan Beam, 2016/11/29 05:25:34]

arguable nit: use dom-if instead of hidden binding

[stevenjb, 2016/11/30 22:58:19]

Done.

+      <extension-controlled-indicator
+          extension-id="[[prefs.proxy.extensionId]]"
+          extension-name="[[prefs.proxy.controlledByName]]"
+          extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]">
+      </extension-controlled-indicator>
     </div>
 
     <!-- Allow shared proxies -->