[DevTools] Improve context and target naming.

third_party/WebKit/Source/devtools/front_end/sources/NavigatorView.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 406 matching lines @@
   /**
    * @param {!Workspace.Project} project
    * @param {!SDK.Target} target
    * @param {?SDK.ResourceTreeFrame} frame
    * @return {!Sources.NavigatorTreeNode}
    */
   _frameNode(project, target, frame) {
     if (!this._groupByFrame || !frame)
       return this._targetNode(project, target);
 
+    if (!frame.parentFrame && target.parentTarget())
+      return this._targetNode(project, target);
+
     var frameNode = this._frameNodes.get(frame);
     if (frameNode)
       return frameNode;
 
     frameNode = new Sources.NavigatorGroupTreeNode(
         this, project, target.id() + ':' + frame.id, Sources.NavigatorView.Types.Frame, frame.displayName());
     frameNode.setHoverCallback(hoverCallback);
     this._frameNodes.set(frame, frameNode);
     this._frameNode(project, target, frame.parentFrame).appendChild(frameNode);
     if (!frame.parentFrame)
@@ skipping 20 matching lines @@
    * @return {!Sources.NavigatorTreeNode}
    */
   _targetNode(project, target) {
     if (target === SDK.targetManager.mainTarget())
       return this._rootNode;
 
     var targetNode = this._rootNode.child('target:' + target.id());
     if (!targetNode) {
       targetNode = new Sources.NavigatorGroupTreeNode(
           this, project, 'target:' + target.id(),
-          !target.hasBrowserCapability() ? Sources.NavigatorView.Types.Worker :
-                                           Sources.NavigatorView.Types.NetworkFolder,
+          !target.hasBrowserCapability() ? Sources.NavigatorView.Types.Worker : Sources.NavigatorView.Types.Frame,
           target.name());
       this._rootNode.appendChild(targetNode);
     }
     return targetNode;
   }
 
   /**
    * @param {!SDK.Target} target
    * @param {string} projectOrigin
    * @return {string}
@@ skipping 1131 matching lines @@
   /**
    * @param {string} title
    * @override
    */
   setTitle(title) {
     this._title = title;
     if (this._treeElement)
       this._treeElement.title = this._title;
   }
 };