squash 'resources/unpacked/devtools' changes from d46095a..5708432

5708432 DevTools: continue context menu sections adoption, only allow adding items into sections.
142ff77 DevTools: automatically migrate http/tests/devtools/tracing/*.html
19232b3 DevTools: allow network override images using drag'n'drop.
d541eab DevTools: automatically migrate http/tests/devtools/security tests
feb6ef9 DevTools: Use :hover instead of .hover for toolbar buttons
0f4d6be DevTools: automatically migrate http/tests/devtools/cache-storage tests
31ab070 Expose originator frame id in Network.requestIntercepted
5ad3466 DevTools: Show warning triangle for CSS files with unsavedCommitedChanges
c711575 DevTools: Fix blue slider not appearing correctly on newly created tabs
54dbd68 Revert "DevTools: Report column number for FunctionCall trace events."
3a1dc2b DevTools: Distinguish functions by line numbers besides names.
8eccb60 DevTools: implement sections in the context menu.

git-subtree-dir: resources/unpacked/devtools
git-subtree-split: 5708432

Author: darwin

front_end/accessibility/AXBreadcrumbsPane.js

@@ -271,7 +271,7 @@ Accessibility.AXBreadcrumbsPane = class extends Accessibility.AccessibilitySubPa
       return;
 
     var contextMenu = new UI.ContextMenu(event);
-    contextMenu.appendItem(Common.UIString('Scroll into view'), () => {
+    contextMenu.viewSection().appendItem(Common.UIString('Scroll into view'), () => {
       axNode.deferredDOMNode().resolvePromise().then(domNode => {
         if (!domNode)
           return;

front_end/audits2/Audits2Panel.js

@@ -36,7 +36,7 @@ Audits2.Audits2Panel = class extends UI.Panel {
 
     this._auditResultsElement = this.contentElement.createChild('div', 'audits2-results-container');
     this._dropTarget = new UI.DropTarget(
-        this.contentElement, [UI.DropTarget.Types.Files], Common.UIString('Drop audit file here'),
+        this.contentElement, [UI.DropTarget.Type.File], Common.UIString('Drop audit file here'),
         this._handleDrop.bind(this));
 
     for (var preset of Audits2.Audits2Panel.Presets)

front_end/changes/ChangesSidebar.js

@@ -108,7 +108,7 @@ Changes.ChangesSidebar.UISourceCodeTreeElement = class extends UI.TreeElement {
 
   _updateTitle() {
     var titleText = this.uiSourceCode.displayName();
-    if (this.uiSourceCode.isDirty() || Persistence.persistence.hasUnsavedCommittedChanges(this.uiSourceCode))
+    if (this.uiSourceCode.isDirty())
       titleText = '*' + titleText;
     this.title = titleText;
 

front_end/color_picker/Spectrum.js

@@ -534,11 +534,13 @@ ColorPicker.Spectrum = class extends UI.VBox {
       return;
     var contextMenu = new UI.ContextMenu(event);
     if (colorIndex !== -1) {
-      contextMenu.appendItem(Common.UIString('Remove color'), this._deletePaletteColors.bind(this, colorIndex, false));
-      contextMenu.appendItem(
+      contextMenu.defaultSection().appendItem(
+          Common.UIString('Remove color'), this._deletePaletteColors.bind(this, colorIndex, false));
+      contextMenu.defaultSection().appendItem(
           Common.UIString('Remove all to the right'), this._deletePaletteColors.bind(this, colorIndex, true));
     }
-    contextMenu.appendItem(Common.UIString('Clear palette'), this._deletePaletteColors.bind(this, -1, true));
+    contextMenu.defaultSection().appendItem(
+        Common.UIString('Clear palette'), this._deletePaletteColors.bind(this, -1, true));
     contextMenu.show();
   }
 

front_end/components/DOMBreakpointsSidebarPane.js

@@ -174,10 +174,10 @@ Components.DOMBreakpointsSidebarPane = class extends UI.VBox {
    */
   _contextMenu(breakpoint, event) {
     var contextMenu = new UI.ContextMenu(event);
-    contextMenu.appendItem(Common.UIString('Remove breakpoint'), () => {
+    contextMenu.defaultSection().appendItem(Common.UIString('Remove breakpoint'), () => {
       breakpoint.domDebuggerModel.removeDOMBreakpoint(breakpoint.node, breakpoint.type);
     });
-    contextMenu.appendItem(Common.UIString('Remove all DOM breakpoints'), () => {
+    contextMenu.defaultSection().appendItem(Common.UIString('Remove all DOM breakpoints'), () => {
       breakpoint.domDebuggerModel.removeAllDOMBreakpoints();
     });
     contextMenu.show();
@@ -273,11 +273,11 @@ Components.DOMBreakpointsSidebarPane.ContextMenuProvider = class {
         domDebuggerModel.setDOMBreakpoint(node, type);
     }
 
-    var breakpointsMenu = contextMenu.appendSubMenuItem(Common.UIString('Break on...'));
+    var breakpointsMenu = contextMenu.debugSection().appendSubMenuItem(Common.UIString('Break on'));
     for (var key in SDK.DOMDebuggerModel.DOMBreakpoint.Type) {
       var type = SDK.DOMDebuggerModel.DOMBreakpoint.Type[key];
       var label = Components.DOMBreakpointsSidebarPane.BreakpointTypeNouns.get(type);
-      breakpointsMenu.appendCheckboxItem(
+      breakpointsMenu.defaultSection().appendCheckboxItem(
           label, toggleBreakpoint.bind(null, type), domDebuggerModel.hasDOMBreakpoint(node, type));
     }
   }

front_end/components/Linkifier.js

@@ -549,23 +549,42 @@ Components.Linkifier = class {
     var request = url ? NetworkLog.networkLog.requestForURL(url) : null;
     var contentProvider = uiLocation ? uiLocation.uiSourceCode : resource;
 
-    if (info.revealable)
-      result.push({title: Common.UIString('Reveal'), handler: () => Common.Revealer.reveal(info.revealable)});
-    if (uiLocation)
-      result.push({title: Common.UIString('Open in Sources panel'), handler: () => Common.Revealer.reveal(uiLocation)});
+    if (info.revealable) {
+      result.push({
+        section: 'reveal',
+        title: Common.UIString('Reveal'),
+        handler: () => Common.Revealer.reveal(info.revealable)
+      });
+    }
+    if (uiLocation) {
+      result.push({
+        section: 'reveal',
+        title: Common.UIString('Open in Sources panel'),
+        handler: () => Common.Revealer.reveal(uiLocation)
+      });
+    }
 
     if (resource) {
-      result.push(
-          {title: Common.UIString('Open in Application panel'), handler: () => Common.Revealer.reveal(resource)});
+      result.push({
+        section: 'reveal',
+        title: Common.UIString('Open in Application panel'),
+        handler: () => Common.Revealer.reveal(resource)
+      });
+    }
+    if (request) {
+      result.push({
+        section: 'reveal',
+        title: Common.UIString('Open in Network panel'),
+        handler: () => Common.Revealer.reveal(request)
+      });
     }
-    if (request)
-      result.push({title: Common.UIString('Open in Network panel'), handler: () => Common.Revealer.reveal(request)});
 
     if (contentProvider) {
       var lineNumber = uiLocation ? uiLocation.lineNumber : info.lineNumber || 0;
       for (var title of Components.Linkifier._linkHandlers.keys()) {
         var handler = Components.Linkifier._linkHandlers.get(title);
         var action = {
+          section: 'reveal',
           title: Common.UIString('Open using %s', title),
           handler: handler.bind(null, contentProvider, lineNumber)
         };
@@ -576,8 +595,13 @@ Components.Linkifier = class {
       }
     }
     if (resource || info.url) {
-      result.push({title: UI.openLinkExternallyLabel(), handler: () => InspectorFrontendHost.openInNewTab(url)});
-      result.push({title: UI.copyLinkAddressLabel(), handler: () => InspectorFrontendHost.copyText(url)});
+      result.push({
+        section: 'reveal',
+        title: UI.openLinkExternallyLabel(),
+        handler: () => InspectorFrontendHost.openInNewTab(url)
+      });
+      result.push(
+          {section: 'clipboard', title: UI.copyLinkAddressLabel(), handler: () => InspectorFrontendHost.copyText(url)});
     }
     return result;
   }
@@ -670,7 +694,7 @@ Components.Linkifier.LinkContextMenuProvider = class {
     var link = /** @type {?Element} */ (targetNode);
     var actions = Components.Linkifier._linkActions(link);
     for (var action of actions)
-      contextMenu.appendItem(action.title, action.handler);
+      contextMenu.section(action.section).appendItem(action.title, action.handler);
   }
 };
 
@@ -731,16 +755,17 @@ Components.Linkifier.ContentProviderContextMenuProvider = class {
     if (!contentProvider.contentURL())
       return;
 
-    contextMenu.appendItem(
+    contextMenu.revealSection().appendItem(
         UI.openLinkExternallyLabel(), () => InspectorFrontendHost.openInNewTab(contentProvider.contentURL()));
     for (var title of Components.Linkifier._linkHandlers.keys()) {
       var handler = Components.Linkifier._linkHandlers.get(title);
-      contextMenu.appendItem(Common.UIString('Open using %s', title), handler.bind(null, contentProvider, 0));
+      contextMenu.revealSection().appendItem(
+          Common.UIString('Open using %s', title), handler.bind(null, contentProvider, 0));
     }
     if (contentProvider instanceof SDK.NetworkRequest)
       return;
 
-    contextMenu.appendItem(
+    contextMenu.clipboardSection().appendItem(
         UI.copyLinkAddressLabel(), () => InspectorFrontendHost.copyText(contentProvider.contentURL()));
   }
 };

front_end/console/ConsoleView.js

@@ -609,32 +609,24 @@ Console.ConsoleView = class extends UI.VBox {
       return;
     }
 
-    function monitoringXHRItemAction() {
-      Common.moduleSetting('monitoringXHREnabled').set(!Common.moduleSetting('monitoringXHREnabled').get());
-    }
-    contextMenu.appendCheckboxItem(
-        Common.UIString('Log XMLHttpRequests'), monitoringXHRItemAction,
-        Common.moduleSetting('monitoringXHREnabled').get());
-
     var sourceElement = event.target.enclosingNodeOrSelfWithClass('console-message-wrapper');
     var consoleMessage = sourceElement ? sourceElement.message.consoleMessage() : null;
 
-    var filterSubMenu = contextMenu.appendSubMenuItem(Common.UIString('Filter'));
+    var filterSubMenu = contextMenu.headerSection().appendSubMenuItem(Common.UIString('Filter'));
 
     if (consoleMessage && consoleMessage.url) {
       var menuTitle = Common.UIString('Hide messages from %s', new Common.ParsedURL(consoleMessage.url).displayName);
-      filterSubMenu.appendItem(menuTitle, this._filter.addMessageURLFilter.bind(this._filter, consoleMessage.url));
+      filterSubMenu.headerSection().appendItem(
+          menuTitle, this._filter.addMessageURLFilter.bind(this._filter, consoleMessage.url));
     }
 
-    filterSubMenu.appendSeparator();
-    var unhideAll =
-        filterSubMenu.appendItem(Common.UIString('Unhide all'), this._filter.removeMessageURLFilter.bind(this._filter));
-    filterSubMenu.appendSeparator();
+    var unhideAll = filterSubMenu.footerSection().appendItem(
+        Common.UIString('Unhide all'), this._filter.removeMessageURLFilter.bind(this._filter));
 
     var hasFilters = false;
 
     for (var url in this._filter.messageURLFilters()) {
-      filterSubMenu.appendCheckboxItem(
+      filterSubMenu.defaultSection().appendCheckboxItem(
           String.sprintf('%s (%d)', new Common.ParsedURL(url).displayName, this._urlToMessageCount[url]),
           this._filter.removeMessageURLFilter.bind(this._filter, url), true);
       hasFilters = true;
@@ -643,15 +635,14 @@ Console.ConsoleView = class extends UI.VBox {
     filterSubMenu.setEnabled(hasFilters || (consoleMessage && consoleMessage.url));
     unhideAll.setEnabled(hasFilters);
 
-    contextMenu.appendSeparator();
-    contextMenu.appendAction('console.clear');
-    contextMenu.appendAction('console.clear.history');
-    contextMenu.appendItem(Common.UIString('Save as...'), this._saveConsole.bind(this));
+    contextMenu.defaultSection().appendAction('console.clear');
+    contextMenu.defaultSection().appendAction('console.clear.history');
+    contextMenu.saveSection().appendItem(Common.UIString('Save as...'), this._saveConsole.bind(this));
 
     var request = consoleMessage ? consoleMessage.request : null;
     if (request && SDK.NetworkManager.canReplayRequest(request)) {
-      contextMenu.appendSeparator();
-      contextMenu.appendItem(Common.UIString('Replay XHR'), SDK.NetworkManager.replayRequest.bind(null, request));
+      contextMenu.debugSection().appendItem(
+          Common.UIString('Replay XHR'), SDK.NetworkManager.replayRequest.bind(null, request));
     }
 
     contextMenu.show();
@@ -1250,11 +1241,12 @@ Console.ConsoleViewFilter = class {
     var levels = setting.get();
 
     var contextMenu = new UI.ContextMenu(mouseEvent, true);
-    contextMenu.appendItem(
+    contextMenu.headerSection().appendItem(
         Common.UIString('Default'), () => setting.set(Console.ConsoleFilter.defaultLevelsFilterValue()));
-    contextMenu.appendSeparator();
-    for (var level in this._levelLabels)
-      contextMenu.appendCheckboxItem(this._levelLabels[level], toggleShowLevel.bind(null, level), levels[level]);
+    for (var level in this._levelLabels) {
+      contextMenu.defaultSection().appendCheckboxItem(
+          this._levelLabels[level], toggleShowLevel.bind(null, level), levels[level]);
+    }
     contextMenu.show();
 
     /**

front_end/data_grid/DataGrid.js

@@ -1027,22 +1027,22 @@ DataGrid.DataGrid = class extends Common.Object {
 
     var gridNode = this.dataGridNodeFromNode(target);
     if (this._refreshCallback && (!gridNode || gridNode !== this.creationNode))
-      contextMenu.appendItem(Common.UIString('Refresh'), this._refreshCallback.bind(this));
+      contextMenu.defaultSection().appendItem(Common.UIString('Refresh'), this._refreshCallback.bind(this));
 
     if (gridNode && gridNode.selectable && !gridNode.isEventWithinDisclosureTriangle(event)) {
       if (this._editCallback) {
         if (gridNode === this.creationNode) {
-          contextMenu.appendItem(Common.UIString('Add new'), this._startEditing.bind(this, target));
+          contextMenu.defaultSection().appendItem(Common.UIString('Add new'), this._startEditing.bind(this, target));
         } else {
           var columnId = this.columnIdFromNode(target);
           if (columnId && this._columns[columnId].editable) {
-            contextMenu.appendItem(
+            contextMenu.defaultSection().appendItem(
                 Common.UIString('Edit "%s"', this._columns[columnId].title), this._startEditing.bind(this, target));
           }
         }
       }
       if (this._deleteCallback && gridNode !== this.creationNode)
-        contextMenu.appendItem(Common.UIString('Delete'), this._deleteCallback.bind(this, gridNode));
+        contextMenu.defaultSection().appendItem(Common.UIString('Delete'), this._deleteCallback.bind(this, gridNode));
       if (this._rowContextMenuCallback)
         this._rowContextMenuCallback(contextMenu, gridNode);
     }

front_end/devices/DevicesView.js

@@ -802,9 +802,9 @@ Devices.DevicesView.DeviceView = class extends UI.VBox {
      * @param {!UI.ContextMenu} contextMenu
      */
     function appendActions(contextMenu) {
-      contextMenu.appendItem(Common.UIString('Reload'), doAction.bind(null, 'reload'));
-      contextMenu.appendItem(Common.UIString('Focus'), doAction.bind(null, 'activate'));
-      contextMenu.appendItem(Common.UIString('Close'), doAction.bind(null, 'close'));
+      contextMenu.defaultSection().appendItem(Common.UIString('Reload'), doAction.bind(null, 'reload'));
+      contextMenu.defaultSection().appendItem(Common.UIString('Focus'), doAction.bind(null, 'activate'));
+      contextMenu.defaultSection().appendItem(Common.UIString('Close'), doAction.bind(null, 'close'));
     }
 
     /**

front_end/elements/ElementsPanel.js

@@ -876,7 +876,7 @@ Elements.ElementsPanel.ContextMenuProvider = class {
     if (Elements.ElementsPanel.instance().element.isAncestor(/** @type {!Node} */ (event.target)))
       return;
     var commandCallback = Common.Revealer.reveal.bind(Common.Revealer, object);
-    contextMenu.appendItem(Common.UIString('Reveal in Elements panel'), commandCallback);
+    contextMenu.revealSection().appendItem(Common.UIString('Reveal in Elements panel'), commandCallback);
   }
 };