MD Settings: show an extension-controlled-indicator for proxy

chrome/browser/resources/settings/system_page/system_page.html

Index: chrome/browser/resources/settings/system_page/system_page.html
diff --git a/chrome/browser/resources/settings/system_page/system_page.html b/chrome/browser/resources/settings/system_page/system_page.html
index 530b7c60927163c0872a251cde047af49ced367c..bbcbd7dab66239eb54ae163ab1994142790a7d9e 100644
--- a/chrome/browser/resources/settings/system_page/system_page.html
+++ b/chrome/browser/resources/settings/system_page/system_page.html
@@ -1,6 +1,7 @@
 <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="/controls/controlled_button.html">
+<link rel="import" href="/controls/extension_controlled_indicator.html">
 <link rel="import" href="/controls/settings_checkbox.html">
 <link rel="import" href="/lifetime_browser_proxy.html">
 <link rel="import" href="/prefs/prefs.html">
@@ -20,6 +21,16 @@
       #hardware-acceleration settings-checkbox {
         flex: 1;
       }
+
+      .proxy-wrapper {
+        align-items: center;
+        display: flex;
+        min-height: inherit;
+      }
+
+      extension-controlled-indicator {
+        width: 100%;
+      }
     </style>
     <div class="settings-box block first">
 <if expr="not is_macosx">
@@ -37,11 +48,23 @@
         </template>
       </div>
     </div>
-    <div class="settings-box">
-      <controlled-button class="primary-button" pref="[[prefs.proxy]]"
-          on-tap="onChangeProxySettingsTap_">
-        $i18n{changeProxySettings}
-      </controlled-button>
+    <div class="settings-box block">
+      <div class="proxy-wrapper">
+        <controlled-button class="primary-button" pref="[[prefs.proxy]]"
+            on-tap="onChangeProxySettingsTap_">
+          $i18n{changeProxySettings}
+        </controlled-button>
+      </div>
+      <template is="dom-if" if="[[prefs.proxy.extensionId]]">
+        <div class="proxy-wrapper">
+          <extension-controlled-indicator
+              extension-id="[[prefs.proxy.extensionId]]"
+              extension-name="[[prefs.proxy.controlledByName]]"
+              extension-can-be-disabled="[[prefs.proxy.extensionCanBeDisabled]]"
+              on-extension-disable="onExtensionDisable_">
+          </extension-controlled-indicator>
+        </div>
+      </template>
     </div>
   </template>
   <script src="/system_page/system_page.js"></script>