Add an extension override bubble and warning box for proxy extensions.

chrome/browser/resources/options/browser_options.js

Index: chrome/browser/resources/options/browser_options.js
diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js
index 5bbd7f092ee73116bba45cb5cbd71dd6fc6fed03..7bb24ede67c6dd6e6864f749cf867364f0edeeda 100644
--- a/chrome/browser/resources/options/browser_options.js
+++ b/chrome/browser/resources/options/browser_options.js
@@ -570,6 +570,9 @@ cr.define('options', function() {
       this.addExtensionControlledBox_('newtab-section-content',
                                       'newtab-controlled',
                                       false);
+      this.addExtensionControlledBox_('proxy-section-content',
+                                      'proxy-controlled',
+                                      true);
 
       document.body.addEventListener('click', function(e) {
         var button = findAncestor(e.target, function(el) {
@@ -1501,10 +1504,14 @@ cr.define('options', function() {
     },
 
     /**
-     * Set the enabled state for the proxy settings button.
+     * Set the enabled state for the proxy settings button and its associated
+     * message when extension controlled.
+     * @param {boolean} disabled Whether the button should be disabled.
+     * @param {boolean} extensionControlled Whether the proxy is extension
+     *     controlled.
      * @private
      */
-    setupProxySettingsSection_: function(disabled, extensionControlled) {
+    setupProxySettingsButton_: function(disabled, extensionControlled) {
       if (!cr.isChromeOS) {
         $('proxiesConfigureButton').disabled = disabled;
         $('proxiesLabel').textContent =
@@ -1619,6 +1626,15 @@ cr.define('options', function() {
                                          'newtab-controlled',
                                          details.newTabPage.id,
                                          details.newTabPage.name);
+      this.toggleExtensionControlledBox_('proxy-section-content',
+                                         'proxy-controlled',
+                                         details.proxy.id,
+                                         details.proxy.name);
+
+      // The proxy section contains just the warning box and nothing else, so
+      // if we're hiding the proxy warning box, we should also hide its header
+      // section.
+      $('proxy-section').hidden = details.proxy.id.length == 0;
     },
 
 
@@ -1787,7 +1803,7 @@ cr.define('options', function() {
     'setThemesResetButtonEnabled',
     'setVirtualKeyboardCheckboxState',
     'setupPageZoomSelector',
-    'setupProxySettingsSection',
+    'setupProxySettingsButton',
     'showBluetoothSettings',
     'showCreateProfileError',
     'showCreateProfileSuccess',