DevTools: group by frame, not product in the network panel.

third_party/WebKit/Source/devtools/front_end/network/NetworkDataGridNode.js

Index: third_party/WebKit/Source/devtools/front_end/network/NetworkDataGridNode.js
diff --git a/third_party/WebKit/Source/devtools/front_end/network/NetworkDataGridNode.js b/third_party/WebKit/Source/devtools/front_end/network/NetworkDataGridNode.js
index e7b74543f56b3d7677a41440ab41c290ae877a1d..94d8333898461e7a884119c7bcbf67eef42ff99e 100644
--- a/third_party/WebKit/Source/devtools/front_end/network/NetworkDataGridNode.js
+++ b/third_party/WebKit/Source/devtools/front_end/network/NetworkDataGridNode.js
@@ -49,7 +49,8 @@ Network.NetworkNode = class extends DataGrid.SortableDataGridNode {
    * @param {!Network.NetworkNode._ProductEntryInfo} entryInfo
    */
   static buildReportLinkElement(entryInfo) {
-    var shadowRoot = UI.createShadowRootWithCoreStyles(createElement('div'), 'network/networkReportProductEntry.css');
+    var element = createElement('div');
+    var shadowRoot = UI.createShadowRootWithCoreStyles(element, 'network/networkReportProductEntry.css');
     var content = shadowRoot.createChild('div', 'network-product-popover');
 
     var domainElement = content.createChild('div', 'network-product-domain');
@@ -63,7 +64,7 @@ Network.NetworkNode = class extends DataGrid.SortableDataGridNode {
         'https://docs.google.com/forms/d/e/1FAIpQLSchz2FdcQ-rRllzl8BbhWaTRRY-12BpPjW6Hr9e1-BpCA083w/viewform' +
         '?entry_1425918171=' + encodeURIComponent((matchedURL.domain() + matchedURL.path).substr(0, 100));
     content.appendChild(UI.createExternalLink(reportLink, 'Report mismatch', 'network-report-product-link'));
-    return shadowRoot;
+    return element;
   }
 
   /**
@@ -104,28 +105,6 @@ Network.NetworkNode = class extends DataGrid.SortableDataGridNode {
     return {entry: entry, matchedURL: parsedURL};
   }
 
-  /**
-   * @protected
-   * @return {!Promise<?Network.NetworkNode._ProductEntryInfo>}
-   */
-  productEntry() {
-    return Promise.resolve(/** @type {?Network.NetworkNode._ProductEntryInfo} */ (null));
-  }
-
-  /**
-   * @param {!UI.PopoverRequest} popover
-   * @return {!Promise<boolean>}
-   */
-  handleProductPopover(popover) {
-    return this.productEntry().then(entryInfo => {
-      if (!entryInfo)
-        return false;
-      popover.setAnchorBehavior(UI.GlassPane.AnchorBehavior.PreferBottom);
-      popover.contentElement.appendChild(Network.NetworkNode.buildReportLinkElement(entryInfo));
-      return true;
-    });
-  }
-
   /**
    * @return {string}
    */
@@ -169,10 +148,6 @@ Network.NetworkNode = class extends DataGrid.SortableDataGridNode {
       color = color.blendWith(bgColors.Navigation);
     if (this.hovered())
       color = color.blendWith(bgColors.Hovered);
-    if (this.isFromFrame())
-      color = color.blendWith(bgColors.FromFrame);
-    else if (this._isProduct)
-      color = color.blendWith(bgColors.IsProduct);
     if (this.isOnInitiatorPath())
       color = color.blendWith(bgColors.InitiatorPath);
     if (this.isOnInitiatedPath())
@@ -187,6 +162,9 @@ Network.NetworkNode = class extends DataGrid.SortableDataGridNode {
     var element = this.existingElement();
     if (!element)
       return;
+
+    element.classList.toggle('network-row-from-frame', this.isFromFrame());
+    element.classList.toggle('network-row-with-product', !this.isFromFrame() && this._isProduct);
     element.style.backgroundColor = this.backgroundColor();
     this._parentView.stylesChanged();
   }
@@ -808,16 +786,6 @@ Network.NetworkRequestNode = class extends Network.NetworkNode {
       case 'name':
         this._renderNameCell(cell);
         break;
-      case 'product':
-        if (!Runtime.experiments.isEnabled('networkGroupingRequests')) {
-          this._setTextAndTitle(cell, this._request.responseHeaderValue(columnId) || '');
-          break;
-        }
-        this.productEntry().then(entryInfo => {
-          if (entryInfo)
-            cell.textContent = entryInfo.entry.name;
-        });
-        break;
       case 'method':
         this._setTextAndTitle(cell, this._request.requestMethod);
         break;
@@ -963,24 +931,6 @@ Network.NetworkRequestNode = class extends Network.NetworkNode {
     cell.title = this._request.url();
   }
 
-  /**
-   * @override
-   * @return {!Promise<?Network.NetworkNode._ProductEntryInfo>}
-   */
-  productEntry() {
-    return ProductRegistry.instance().then(productRegistry => {
-      var frame = SDK.ResourceTreeModel.frameForRequest(this._request);
-      var entry = /** @type {?ProductRegistry.Registry.ProductEntry} */ (null);
-      if (frame && frame.isMainFrame())
-        frame = null;
-      var entryInfo = frame ? Network.NetworkNode.productEntryInfoForFrame(productRegistry, frame) : null;
-      if (entryInfo)
-        return entryInfo;
-      entry = productRegistry.entryForUrl(this._request.parsedURL);
-      return entry ? {entry: entry, matchedURL: this._request.parsedURL} : null;
-    });
-  }
-
   /**
    * @param {!Element} cell
    */