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

netlog_viewer/proxy_view.js

Index: netlog_viewer/proxy_view.js
diff --git a/netlog_viewer/proxy_view.js b/netlog_viewer/proxy_view.js
index 10534137408b393a27e1040eb996a1ebd98c41cd..4bd5564fda69685c9a768a67c8a5c319c8a32491 100644
--- a/netlog_viewer/proxy_view.js
+++ b/netlog_viewer/proxy_view.js
@@ -25,12 +25,6 @@ var ProxyView = (function() {
     // 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);
@@ -46,10 +40,8 @@ var ProxyView = (function() {
   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';