Settings: Internet: Update proxy controlled indicator and fields.

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 629586123c22b8e56ed9ec290f670b91baa299ca..44c21d88e66921286fdfd39b1b7284c28036793c 100644
--- a/chrome/browser/resources/settings/internet_page/network_proxy.html
+++ b/chrome/browser/resources/settings/internet_page/network_proxy.html
@@ -1,6 +1,7 @@
 <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/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">
@@ -41,13 +42,12 @@
     </style>
     <!-- Policy indicator -->
     <div class="settings-box first single-column"
-        hidden$="[[!isNetworkPolicyControlled(
-                 networkProperties.ProxySettings.Type)]]">
+        hidden$="[[!isControlled(networkProperties.ProxySettings.Type)]]">
       <div class="layout horizontal center">
         <cr-policy-network-indicator
             property="[[networkProperties.ProxySettings.Type]]">
         </cr-policy-network-indicator>
-        <div>$i18n{networkProxyEnforced}</div>
+        <div>[[getEnforcedString_(networkProperties.ProxySettings.Type)]]</div>
       </div>
     </div>
 
@@ -56,9 +56,10 @@
       <div class="start">$i18n{networkProxyConnectionType}</div>
       <div class="md-select-wrapper">
         <select id="proxyType" class="md-select" on-change="onTypeChange_"
-            value="[[proxy.Type]]">
+            value="[[proxy.Type]]"
+            disabled="[[isProxyTypeDisabled_(networkProperties)]]">
           <template is="dom-repeat" items="[[proxyTypes_]]">
-            <option value="[[item]]">[[proxyTypeDesc_(item)]]</option>
+            <option value="[[item]]">[[getProxyTypeDesc_(item)]]</option>
           </template>
         </select>
         <span class="md-select-underline"></span>
@@ -70,8 +71,7 @@
         hidden$="[[!matches_(proxy.Type, ProxySettingsType_.PAC)]]">
       <div>$i18n{networkProxyAutoConfig}</div>
       <paper-input no-label-float class="middle" value="{{proxy.PAC}}"
-          disabled="[[isNetworkPolicyEnforced(
-                    networkProperties.ProxySettings.PAC)]]"
+          disabled="[[isEnforced_(networkProperties.ProxySettings.PAC)]]"
           on-blur="onProxyInputChange_">
       </paper-input>
     </div>