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

chrome/browser/resources/options/browser_options.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('options', function() {
   var OptionsPage = options.OptionsPage;
   var ArrayDataModel = cr.ui.ArrayDataModel;
   var RepeatingButton = cr.ui.RepeatingButton;
   var HotwordSearchSettingIndicator = options.HotwordSearchSettingIndicator;
 
@@ skipping 552 matching lines @@
                                       true);
       this.addExtensionControlledBox_('extension-controlled-container',
                                       'homepage-controlled',
                                       true);
       this.addExtensionControlledBox_('startup-section-content',
                                       'startpage-controlled',
                                       false);
       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) {
           return el.tagName == 'BUTTON' &&
                  el.dataset.extensionId !== undefined &&
                  el.dataset.extensionId.length;
         });
         if (button)
           chrome.send('disableExtension', [button.dataset.extensionId]);
       });
@@ skipping 911 matching lines @@
               $('auto-open-file-types-container'));
         } else {
           this.hideSectionWithAnimation_(
               $('auto-open-file-types-section'),
               $('auto-open-file-types-container'));
         }
       }
     },
 
     /**
-     * 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 =
             loadTimeData.getString(extensionControlled ?
                 'proxiesLabelExtension' : 'proxiesLabelSystem');
       }
     },
 
     /**
      * Set the initial state of the spoken feedback checkbox.
@@ skipping 94 matching lines @@
                                          details.homePage.id,
                                          details.homePage.name);
       this.toggleExtensionControlledBox_('startup-section-content',
                                          'startpage-controlled',
                                          details.startUpPage.id,
                                          details.startUpPage.name);
       this.toggleExtensionControlledBox_('newtab-section-content',
                                          '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;
     },
 
 
     /**
      * Show/hide touchpad-related settings.
      * @private
      */
     showTouchpadControls_: function(show) {
       $('touchpad-settings').hidden = !show;
       $('accessibility-tap-dragging').hidden = !show;
@@ skipping 148 matching lines @@
     'setFontSize',
     'setNativeThemeButtonEnabled',
     'setHighContrastCheckboxState',
     'setMetricsReportingCheckboxState',
     'setMetricsReportingSettingVisibility',
     'setProfilesInfo',
     'setSpokenFeedbackCheckboxState',
     'setThemesResetButtonEnabled',
     'setVirtualKeyboardCheckboxState',
     'setupPageZoomSelector',
-    'setupProxySettingsSection',
+    'setupProxySettingsButton',
     'showBluetoothSettings',
     'showCreateProfileError',
     'showCreateProfileSuccess',
     'showCreateProfileWarning',
     'showHotwordSection',
     'showManagedUserImportError',
     'showManagedUserImportSuccess',
     'showMouseControls',
     'showTouchpadControls',
     'toggleExtensionIndicators',
@@ skipping 21 matching lines @@
     BrowserOptions.getLoggedInUsername = function() {
       return BrowserOptions.getInstance().username_;
     };
   }
 
   // Export
   return {
     BrowserOptions: BrowserOptions
   };
 });