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.

[Dan Beam, 2014/05/20 16:46:41]

can you update this to say "proxy settings section" or something like this?

[Dan Beam, 2014/05/20 16:46:41]

nit: can you document these params? e.g.

  * @param {<type_goes_here>} disabled ....
  * @param {<type_goes_here>} extensionControlled ...

[Finnur, 2014/05/21 16:30:32]

So... there's a proxy button way down on the page (under the Network section),
which toggles enabled/disabled based on whether the user can configure the proxy
and also an associated message next to the button that is shown when the button
is disabled specifically because an extension is controlling the setting (as
opposed to policy).

This particular function is misnamed because there was no specific proxy section
(until now). So, I've changed the name to setupProxySettingsButton_ to alleviate
the ambiguity a bit.

If you are asking yourself why didn't we attach the message to that button
instead of adding a special section for it, the answer is: it is so far down,
below the fold, that people were concerned it was buried and wanted more
visibility that comes with adding a section on demand.

However, I've come to the realization that it is not right to remove the
message, so I've reverted this particular change.

      * @private
      */
     setupProxySettingsSection_: function(disabled, extensionControlled) {
       if (!cr.isChromeOS) {
         $('proxiesConfigureButton').disabled = disabled;
-        $('proxiesLabel').textContent =
-            loadTimeData.getString(extensionControlled ?
-                'proxiesLabelExtension' : 'proxiesLabelSystem');
+        $('proxiesLabel').hidden = extensionControlled;
       }
     },
 
     /**
      * Set the initial state of the spoken feedback checkbox.
      * @private
      */
     setSpokenFeedbackCheckboxState_: function(checked) {
       $('accessibility-spoken-feedback-check').checked = checked;
     },
@@ skipping 89 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 190 matching lines @@
     BrowserOptions.getLoggedInUsername = function() {
       return BrowserOptions.getInstance().username_;
     };
   }
 
   // Export
   return {
     BrowserOptions: BrowserOptions
   };
 });