Bring the gh-pages branch up to date with the master branch

netlog_viewer/proxy_view.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.
 
 /**
  * This view displays information on the proxy setup:
  *
  *   - Shows the current proxy settings.
  *   - Has a button to reload these settings.
  *   - Shows the list of proxy hostnames that are cached as "bad".
  *   - Has a button to clear the cached bad proxies.
  */
 var ProxyView = (function() {
   'use strict';
 
   // We inherit from DivView.
   var superClass = DivView;
 
   /**
    * @constructor
    */
   function ProxyView() {
     assertFirstConstructorCall(ProxyView);
 
     // Call superclass's constructor.
     superClass.call(this, ProxyView.MAIN_BOX_ID);
 
-    // Hook up the UI components.
-    $(ProxyView.RELOAD_SETTINGS_BUTTON_ID).onclick =
-        g_browser.sendReloadProxySettings.bind(g_browser);
-    $(ProxyView.CLEAR_BAD_PROXIES_BUTTON_ID).onclick =
-        g_browser.sendClearBadProxies.bind(g_browser);
-
     // Register to receive proxy information as it changes.
     g_browser.addProxySettingsObserver(this, true);
     g_browser.addBadProxiesObserver(this, true);
   }
 
   ProxyView.TAB_ID = 'tab-handle-proxy';
   ProxyView.TAB_NAME = 'Proxy';
   ProxyView.TAB_HASH = '#proxy';
 
   // IDs for special HTML elements in proxy_view.html
   ProxyView.MAIN_BOX_ID = 'proxy-view-tab-content';
   ProxyView.ORIGINAL_SETTINGS_DIV_ID = 'proxy-view-original-settings';
   ProxyView.EFFECTIVE_SETTINGS_DIV_ID = 'proxy-view-effective-settings';
   ProxyView.ORIGINAL_CONTENT_DIV_ID = 'proxy-view-original-content';
   ProxyView.EFFECTIVE_CONTENT_DIV_ID = 'proxy-view-effective-content';
-  ProxyView.RELOAD_SETTINGS_BUTTON_ID = 'proxy-view-reload-settings';
   ProxyView.BAD_PROXIES_DIV_ID = 'proxy-view-bad-proxies-div';
   ProxyView.BAD_PROXIES_TBODY_ID = 'proxy-view-bad-proxies-tbody';
-  ProxyView.CLEAR_BAD_PROXIES_BUTTON_ID = 'proxy-view-clear-bad-proxies';
   ProxyView.SOCKS_HINTS_DIV_ID = 'proxy-view-socks-hints';
   ProxyView.SOCKS_HINTS_FLAG_DIV_ID = 'proxy-view-socks-hints-flag';
 
   cr.addSingletonGetter(ProxyView);
 
   ProxyView.prototype = {
     // Inherit the superclass's methods.
     __proto__: superClass.prototype,
 
     onLoadLogFinish: function(data) {
@@ skipping 115 matching lines @@
     matches = /^\[(.*)\]$/.exec(result.host);
     if (matches)
       result.host = matches[1];
 
     return result;
   }
 
   return ProxyView;
 })();