Add cr-policy-network-indicator to internet pages

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 61ae5fdc3c7e49eaaf9379b3a3c96bb662aa33b2..b3d31dd905ee371b660d7dcca811c3de89ff3123 100644
--- a/chrome/browser/resources/settings/internet_page/network_proxy.html
+++ b/chrome/browser/resources/settings/internet_page/network_proxy.html
@@ -4,6 +4,8 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/paper-styles.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_property_list.html">
 <link rel="import" href="network_proxy_input.html">
 <link rel="import" href="network_proxy_exclusions.html">
@@ -13,8 +15,17 @@
   <template>
     <div id="outer" class="layout vertical flex">
       <!-- TODO(stevenjb): Use cr-dropdown-menu once available. -->
+      <div class="layout horizontal center" hidden$=
+          "[[!isNetworkPolicyControlled(networkProperties.ProxySettings.Type)]]">
+        <cr-policy-network-indicator
+             property="[[networkProperties.ProxySettings.Type]]">

[michaelpg, 2015/10/10 06:01:32]

fix indent

[stevenjb, 2015/10/22 19:08:08]

Done.

+        </cr-policy-network-indicator>
+        <span>This proxy is enforced by your administrator.</span>
+      </div>
+
       <div>
-        <select id="selectType" on-change="onTypeChange_">
+        <select id="selectType" on-change="onTypeChange_"
+            disabled$="[[isNetworkPolicyEnforced(networkProperties.ProxySettings.Type)]]">
           <template is="dom-repeat" items="[[proxyTypes_]]">
             <option value="[[item]]">[[proxyTypeDesc_(item)]]</option>
           </template>
@@ -25,6 +36,7 @@
           class="layout horizontal">
         <span>Autoconfiguration URL:</span>
         <paper-input no-label-float class="flex" value="{{proxy.PAC}}"
+            disabled="[[isNetworkPolicyEnforced(networkProperties.ProxySettings.PAC)]]">
             on-blur="onProxyInputChange_">
         </paper-input>
       </div>
@@ -40,25 +52,30 @@
             Use the same proxy for all protocols
         </paper-checkbox>
         <div hidden$="[[!useSameProxy]]" class="layout vertical">
-          <network-proxy-input editable="[[editable]]"
+          <network-proxy-input
+              editable="[[isPropertyEditable_(editable, networkProperties, 'ProxySettings.Manual.HTTPProxy')]]"
               value="{{proxy.Manual.HTTPProxy}}"
               label="Proxy" on-proxy-change="onProxyInputChange_">
           </network-proxy-input>
         </div>
         <div hidden$="[[useSameProxy]]" class="layout vertical">
-          <network-proxy-input editable="[[editable]]"
+          <network-proxy-input
+              editable="[[isPropertyEditable_(editable, networkProperties, 'ProxySettings.Manual.HTTPProxy)')]]"
               value="{{proxy.Manual.HTTPProxy}}"
               label="HTTP Proxy" on-proxy-change="onProxyInputChange_">
           </network-proxy-input>
-          <network-proxy-input editable="[[editable]]"
+          <network-proxy-input
+              editable="[[isPropertyEditable_(editable, networkProperties, 'ProxySettings.Manual.SecureHTTPProxy)')]]"
               value="{{proxy.Manual.SecureHTTPProxy}}"
               label="Secure HTTP Proxy" on-proxy-change="onProxyInputChange_">
           </network-proxy-input>
-          <network-proxy-input editable="[[editable]]"
+          <network-proxy-input
+              editable="[[isPropertyEditable_(editable, networkProperties, 'ProxySettings.Manual.FTPProxy)')]]"
               value="{{proxy.Manual.FTPProxy}}"
               label="FTP Proxy" on-proxy-change="onProxyInputChange_">
           </network-proxy-input>
-          <network-proxy-input editable="[[editable]]"
+          <network-proxy-input
+              editable="[[isPropertyEditable_(editable, networkProperties, 'ProxySettings.Manual.SOCKS)')]]"
               value="{{proxy.Manual.SOCKS}}"
               label="SOCKS host" on-proxy-change="onProxyInputChange_">
           </network-proxy-input>