Merge pull request #16 from kdzwinel/5-remove-ui-elements

Remove unused UI elements

Author: kdzwinel

dt/network/NetworkLogView.js

@@ -44,7 +44,6 @@ WebInspector.NetworkLogView = function(filterBar, progressBarContainer, networkL
     this.registerRequiredCSS("network/networkLogView.css");
     this.registerRequiredCSS("ui/filter.css");
 
-    this._networkHideDataURLSetting = WebInspector.settings.createSetting("networkHideDataURL", false);
     this._networkResourceTypeFiltersSetting = WebInspector.settings.createSetting("networkResourceTypeFilters", {});
     this._networkShowPrimaryLoadWaterfallSetting = WebInspector.settings.createSetting("networkShowPrimaryLoadWaterfall", false);
 
@@ -257,11 +256,6 @@ WebInspector.NetworkLogView.prototype = {
         this._textFilterUI.addEventListener(WebInspector.FilterUI.Events.FilterChanged, this._filterChanged, this);
         this._filterBar.addFilter(this._textFilterUI);
 
-        var dataURLSetting = this._networkHideDataURLSetting;
-        this._dataURLFilterUI = new WebInspector.CheckboxFilterUI("hide-data-url", WebInspector.UIString("Hide data URLs"), true, dataURLSetting);
-        this._dataURLFilterUI.addEventListener(WebInspector.FilterUI.Events.FilterChanged, this._filterChanged.bind(this), this);
-        this._filterBar.addFilter(this._dataURLFilterUI);
-
         var filterItems = [];
         for (var categoryId in WebInspector.resourceCategories) {
             var category = WebInspector.resourceCategories[categoryId];
@@ -313,18 +307,14 @@ WebInspector.NetworkLogView.prototype = {
         this._hideRecordingHint();
         this._recordingHint = this.element.createChild("div", "network-status-pane fill");
         var hintText = this._recordingHint.createChild("div", "recording-hint");
-        var reloadShortcutNode = this._recordingHint.createChild("b");
-        reloadShortcutNode.textContent = WebInspector.shortcutRegistry.shortcutDescriptorsForAction("main.reload")[0].name;
 
         if (this._recording) {
             var recordingText = hintText.createChild("span");
             recordingText.textContent = WebInspector.UIString("Recording network activity\u2026");
-            hintText.createChild("br");
-            hintText.appendChild(WebInspector.formatLocalized(WebInspector.UIString("Perform a request or hit %s to record the reload."), [reloadShortcutNode], null));
         } else {
             var recordNode = hintText.createChild("b");
             recordNode.textContent = WebInspector.shortcutRegistry.shortcutTitleForAction("network.toggle-recording");
-            hintText.appendChild(WebInspector.formatLocalized(WebInspector.UIString("Record (%s) or reload (%s) to display network activity."), [recordNode, reloadShortcutNode], null));
+            hintText.appendChild(WebInspector.formatLocalized(WebInspector.UIString("Record (%s) to display network activity."), [recordNode], null));
         }
     },
 
@@ -1361,10 +1351,6 @@ WebInspector.NetworkLogView.prototype = {
         contextMenu.appendSeparator();
         contextMenu.appendItem(WebInspector.UIString.capitalize("Save as HAR with ^content"), this._exportAll.bind(this));
 
-        contextMenu.appendSeparator();
-        contextMenu.appendItem(WebInspector.UIString.capitalize("Clear ^browser ^cache"), this._clearBrowserCache.bind(this));
-        contextMenu.appendItem(WebInspector.UIString.capitalize("Clear ^browser ^cookies"), this._clearBrowserCookies.bind(this));
-
         var blockedSetting = WebInspector.moduleSetting("blockedURLs");
         if (request && Runtime.experiments.isEnabled("requestBlocking")) {  // Disabled until ready.
             contextMenu.appendSeparator();
@@ -1635,8 +1621,6 @@ WebInspector.NetworkLogView.prototype = {
         var categoryName = request.resourceType().category().title;
         if (!this._resourceCategoryFilterUI.accept(categoryName))
             return false;
-        if (this._dataURLFilterUI.checked() && request.parsedURL.isDataURL())
-            return false;
         for (var i = 0; i < this._filters.length; ++i) {
             if (!this._filters[i](request))
                 return false;

dt/network/NetworkPanel.js

@@ -123,8 +123,6 @@ WebInspector.NetworkPanel.prototype = {
         this._clearButton.addEventListener("click", this._onClearButtonClicked, this);
         this._panelToolbar.appendToolbarItem(this._clearButton);
         this._panelToolbar.appendSeparator();
-        var recordFilmStripButton = new WebInspector.ToolbarSettingToggle(this._networkRecordFilmStripSetting, "camera-toolbar-item", WebInspector.UIString("Capture screenshots"));
-        this._panelToolbar.appendToolbarItem(recordFilmStripButton);
 
         this._panelToolbar.appendToolbarItem(this._filterBar.filterButton());
         this._panelToolbar.appendSeparator();
@@ -139,16 +137,8 @@ WebInspector.NetworkPanel.prototype = {
         this._panelToolbar.appendToolbarItem(showOverviewButton);
         this._panelToolbar.appendSeparator();
 
-        this._preserveLogCheckbox = new WebInspector.ToolbarCheckbox(WebInspector.UIString("Preserve log"), WebInspector.UIString("Do not clear log on page reload / navigation"));
-        this._preserveLogCheckbox.inputElement.addEventListener("change", this._onPreserveLogCheckboxChanged.bind(this), false);
-        this._panelToolbar.appendToolbarItem(this._preserveLogCheckbox);
-
-        this._disableCacheCheckbox = new WebInspector.ToolbarCheckbox(WebInspector.UIString("Disable cache"), WebInspector.UIString("Disable cache (while DevTools is open)"), WebInspector.moduleSetting("cacheDisabled"));
-        this._panelToolbar.appendToolbarItem(this._disableCacheCheckbox);
-
         this._panelToolbar.appendSeparator();
         this._panelToolbar.appendToolbarItem(this._createBlockedURLsButton());
-        this._panelToolbar.appendToolbarItem(this._createNetworkConditionsSelect());
         this._panelToolbar.appendToolbarItem(new WebInspector.ToolbarItem(this._progressBarContainer));
     },
 
@@ -183,7 +173,7 @@ WebInspector.NetworkPanel.prototype = {
 
     _toggleRecording: function()
     {
-        if (!this._preserveLogCheckbox.checked() && !this._recordButton.toggled())
+        if (!this._recordButton.toggled())
             this._reset();
         this._toggleRecordButton(!this._recordButton.toggled());
     },
@@ -224,14 +214,6 @@ WebInspector.NetworkPanel.prototype = {
         this._networkLogView.addFilmStripFrames(timestamps);
     },
 
-    /**
-     * @param {!Event} event
-     */
-    _onPreserveLogCheckboxChanged: function(event)
-    {
-        this._networkLogView.setPreserveLog(this._preserveLogCheckbox.checked());
-    },
-
     /**
      * @param {!WebInspector.Event} event
      */
@@ -255,8 +237,7 @@ WebInspector.NetworkPanel.prototype = {
      */
     _willReloadPage: function(event)
     {
-        if (!this._preserveLogCheckbox.checked())
-            this._reset();
+        this._reset();
         this._toggleRecordButton(true);
         if (this._pendingStopTimer) {
             clearTimeout(this._pendingStopTimer);