<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[183333] trunk/Source/WebInspectorUI</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/183333">183333</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-04-25 18:22:10 -0700 (Sat, 25 Apr 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: Change more places that changed WebInspector.navigationSidebar.selectedSidebarPanel to tabs
https://bugs.webkit.org/show_bug.cgi?id=144125

Reviewed by Joseph Pecoraro.

* UserInterface/Base/Main.js:
(WebInspector.loaded):
(WebInspector.toggleDetailsSidebar):
(WebInspector.tabContentViewClassForRepresentedObject):
(WebInspector._updateModifierKeys):
(WebInspector._consoleResizerMouseDown.dockedResizerDragEnd):
(WebInspector._consoleResizerMouseDown):
(WebInspector.linkifyURLAsNode):
(WebInspector.linkifyStringAsFragmentWithCustomLinkifier):
* UserInterface/Protocol/InspectorFrontendAPI.js:
(InspectorFrontendAPI.setTimelineProfilingEnabled):
(InspectorFrontendAPI.showConsole):
(InspectorFrontendAPI.showResources):
* UserInterface/Protocol/InspectorObserver.js:
(WebInspector.InspectorObserver.prototype.inspect):
* UserInterface/Views/DebuggerTabContentView.js:
(WebInspector.DebuggerTabContentView.prototype.canShowRepresentedObject):
(WebInspector.DebuggerTabContentView.prototype.revealAndSelectBreakpoint):
* UserInterface/Views/DefaultDashboardView.js:
(WebInspector.DefaultDashboardView):
(WebInspector.DefaultDashboardView.prototype._resourcesWasClicked):
* UserInterface/Views/SourceCodeTextEditor.js:
(WebInspector.SourceCodeTextEditor.prototype.textEditorGutterContextMenu.revealInSidebar):
* UserInterface/Views/TabBrowser.js:
(WebInspector.TabBrowser.bestTabContentViewForClass):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseMainjs">trunk/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolInspectorFrontendAPIjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolInspectorObserverjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorObserver.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDebuggerTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDefaultDashboardViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTabBrowserjs">trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (183332 => 183333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2015-04-26 01:21:38 UTC (rev 183332)
+++ trunk/Source/WebInspectorUI/ChangeLog        2015-04-26 01:22:10 UTC (rev 183333)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2015-04-23  Timothy Hatcher  &lt;timothy@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Web Inspector: Change more places that changed WebInspector.navigationSidebar.selectedSidebarPanel to tabs
+        https://bugs.webkit.org/show_bug.cgi?id=144125
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Base/Main.js:
+        (WebInspector.loaded):
+        (WebInspector.toggleDetailsSidebar):
+        (WebInspector.tabContentViewClassForRepresentedObject):
+        (WebInspector._updateModifierKeys):
+        (WebInspector._consoleResizerMouseDown.dockedResizerDragEnd):
+        (WebInspector._consoleResizerMouseDown):
+        (WebInspector.linkifyURLAsNode):
+        (WebInspector.linkifyStringAsFragmentWithCustomLinkifier):
+        * UserInterface/Protocol/InspectorFrontendAPI.js:
+        (InspectorFrontendAPI.setTimelineProfilingEnabled):
+        (InspectorFrontendAPI.showConsole):
+        (InspectorFrontendAPI.showResources):
+        * UserInterface/Protocol/InspectorObserver.js:
+        (WebInspector.InspectorObserver.prototype.inspect):
+        * UserInterface/Views/DebuggerTabContentView.js:
+        (WebInspector.DebuggerTabContentView.prototype.canShowRepresentedObject):
+        (WebInspector.DebuggerTabContentView.prototype.revealAndSelectBreakpoint):
+        * UserInterface/Views/DefaultDashboardView.js:
+        (WebInspector.DefaultDashboardView):
+        (WebInspector.DefaultDashboardView.prototype._resourcesWasClicked):
+        * UserInterface/Views/SourceCodeTextEditor.js:
+        (WebInspector.SourceCodeTextEditor.prototype.textEditorGutterContextMenu.revealInSidebar):
+        * UserInterface/Views/TabBrowser.js:
+        (WebInspector.TabBrowser.bestTabContentViewForClass):
+
+2015-04-23  Timothy Hatcher  &lt;timothy@apple.com&gt;
+
</ins><span class="cx">         Web Inspector: Make Console work in a tab world
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=144112
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (183332 => 183333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js        2015-04-26 01:21:38 UTC (rev 183332)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js        2015-04-26 01:22:10 UTC (rev 183333)
</span><span class="lines">@@ -127,6 +127,8 @@
</span><span class="cx">     this.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.Resumed, this._debuggerDidResume, this);
</span><span class="cx">     this.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.InspectModeStateChanged, this._inspectModeStateChanged, this);
</span><span class="cx">     this.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.DOMNodeWasInspected, this._domNodeWasInspected, this);
</span><ins>+    this.storageManager.addEventListener(WebInspector.StorageManager.Event.DOMStorageObjectWasInspected, this._storageWasInspected, this);
+    this.storageManager.addEventListener(WebInspector.StorageManager.Event.DatabaseWasInspected, this._storageWasInspected, this);
</ins><span class="cx">     this.frameResourceManager.addEventListener(WebInspector.FrameResourceManager.Event.MainFrameDidChange, this._mainFrameDidChange, this);
</span><span class="cx">     this.frameResourceManager.addEventListener(WebInspector.FrameResourceManager.Event.FrameWasAdded, this._frameWasAdded, this);
</span><span class="cx"> 
</span><span class="lines">@@ -653,6 +655,42 @@
</span><span class="cx">     return this.tabBrowser.selectedTabContentView instanceof WebInspector.ConsoleTabContentView;
</span><span class="cx"> };
</span><span class="cx"> 
</span><ins>+WebInspector.showElementsTab = function()
+{
+    var tabContentView = this.tabBrowser.bestTabContentViewForClass(WebInspector.ElementsTabContentView);
+    if (!tabContentView)
+        tabContentView = new WebInspector.ElementsTabContentView;
+    this.tabBrowser.showTabForContentView(tabContentView);
+};
+
+WebInspector.showDebuggerTab = function(breakpointToSelect)
+{
+    var tabContentView = this.tabBrowser.bestTabContentViewForClass(WebInspector.DebuggerTabContentView);
+    if (!tabContentView)
+        tabContentView = new WebInspector.DebuggerTabContentView;
+
+    if (breakpointToSelect instanceof WebInspector.Breakpoint)
+        tabContentView.revealAndSelectBreakpoint(breakpointToSelect);
+
+    this.tabBrowser.showTabForContentView(tabContentView);
+};
+
+WebInspector.showResourcesTab = function()
+{
+    var tabContentView = this.tabBrowser.bestTabContentViewForClass(WebInspector.ResourcesTabContentView);
+    if (!tabContentView)
+        tabContentView = new WebInspector.ResourcesTabContentView;
+    this.tabBrowser.showTabForContentView(tabContentView);
+};
+
+WebInspector.showTimelineTab = function()
+{
+    var tabContentView = this.tabBrowser.bestTabContentViewForClass(WebInspector.TimelineTabContentView);
+    if (!tabContentView)
+        tabContentView = new WebInspector.TimelineTabContentView;
+    this.tabBrowser.showTabForContentView(tabContentView);
+};
+
</ins><span class="cx"> WebInspector.UIString = function(string, vararg)
</span><span class="cx"> {
</span><span class="cx">     if (WebInspector.dontLocalizeUserInterface)
</span><span class="lines">@@ -923,13 +961,10 @@
</span><span class="cx"> 
</span><span class="cx"> WebInspector._debuggerDidPause = function(event)
</span><span class="cx"> {
</span><del>-    this.debuggerSidebarPanel.show();
</del><ins>+    this.showDebuggerTab();
+
</ins><span class="cx">     this.dashboardContainer.showDashboardViewForRepresentedObject(this.dashboardManager.dashboards.debugger);
</span><span class="cx"> 
</span><del>-    // Since the Scope Chain details sidebar panel might not be in the sidebar yet,
-    // set a flag to select and show it when it does become available.
-    this._selectAndShowScopeChainDetailsSidebarPanelWhenAvailable = true;
-
</del><span class="cx">     InspectorFrontendHost.bringToFront();
</span><span class="cx"> };
</span><span class="cx"> 
</span><span class="lines">@@ -1169,17 +1204,6 @@
</span><span class="cx">     this._updateContentViewForCurrentNavigationSidebar();
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-WebInspector._domNodeWasInspected = function(event)
-{
-    WebInspector.domTreeManager.highlightDOMNodeForTwoSeconds(event.data.node.id);
-
-    // Select the Style details sidebar panel if one of the DOM details sidebar panels isn't already selected.
-    if (!(this.detailsSidebar.selectedSidebarPanel instanceof WebInspector.DOMDetailsSidebarPanel))
-        this.detailsSidebar.selectedSidebarPanel = this.cssStyleDetailsSidebarPanel;
-
-    InspectorFrontendHost.bringToFront();
-};
-
</del><span class="cx"> WebInspector._contentBrowserSizeDidChange = function(event)
</span><span class="cx"> {
</span><span class="cx">     this.contentBrowser.updateLayout();
</span><span class="lines">@@ -1605,6 +1629,21 @@
</span><span class="cx">     WebInspector.elementDragStart(event.target, toolbarDrag, toolbarDragEnd, event, &quot;default&quot;);
</span><span class="cx"> };
</span><span class="cx"> 
</span><ins>+WebInspector._storageWasInspected = function(event)
+{
+    // FIXME: This should show a Storage tab when we have one.
+    this.showResourcesTab();
+};
+
+WebInspector._domNodeWasInspected = function(event)
+{
+    WebInspector.domTreeManager.highlightDOMNodeForTwoSeconds(event.data.node.id);
+
+    InspectorFrontendHost.bringToFront();
+
+    this.showMainFrameDOMTree(event.data.node);
+};
+
</ins><span class="cx"> WebInspector._inspectModeStateChanged = function(event)
</span><span class="cx"> {
</span><span class="cx">     this._inspectModeToolbarButton.activated = WebInspector.domTreeManager.inspectModeEnabled;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolInspectorFrontendAPIjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js (183332 => 183333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js        2015-04-26 01:21:38 UTC (rev 183332)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js        2015-04-26 01:22:10 UTC (rev 183333)
</span><span class="lines">@@ -48,8 +48,7 @@
</span><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx">         if (enabled) {
</span><del>-            WebInspector.navigationSidebar.selectedSidebarPanel = WebInspector.timelineSidebarPanel;
-            WebInspector.timelineSidebarPanel.showTimelineOverview();
</del><ins>+            WebInspector.showTimelineTab();
</ins><span class="cx">             WebInspector.timelineManager.startCapturing();
</span><span class="cx">         } else {
</span><span class="cx">             WebInspector.timelineManager.stopCapturing();
</span><span class="lines">@@ -84,14 +83,11 @@
</span><span class="cx"> 
</span><span class="cx">     showResources: function()
</span><span class="cx">     {
</span><del>-        WebInspector.ignoreLastContentCookie = true;
-        WebInspector.navigationSidebar.selectedSidebarPanel = WebInspector.resourceSidebarPanel;
-        WebInspector.navigationSidebar.collapsed = false;
</del><ins>+        WebInspector.showResourcesTab();
</ins><span class="cx">     },
</span><span class="cx"> 
</span><span class="cx">     showMainResourceForFrame: function(frameIdentifier)
</span><span class="cx">     {
</span><del>-        WebInspector.ignoreLastContentCookie = true;
</del><span class="cx">         WebInspector.showSourceCodeForFrame(frameIdentifier, true);
</span><span class="cx">     },
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolInspectorObserverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorObserver.js (183332 => 183333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorObserver.js        2015-04-26 01:21:38 UTC (rev 183332)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorObserver.js        2015-04-26 01:22:10 UTC (rev 183333)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx">         var remoteObject = WebInspector.RemoteObject.fromPayload(payload);
</span><span class="cx">         if (remoteObject.subtype === &quot;node&quot;) {
</span><span class="cx">             WebInspector.domTreeManager.inspectNodeObject(remoteObject);
</span><del>-            WebInspector.navigationSidebar.selectedSidebarPanel = WebInspector.resourceSidebarPanel;
</del><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -51,8 +50,6 @@
</span><span class="cx">         else if (hints.domStorageId)
</span><span class="cx">             WebInspector.storageManager.inspectDOMStorage(hints.domStorageId);
</span><span class="cx"> 
</span><del>-        WebInspector.navigationSidebar.selectedSidebarPanel = WebInspector.resourceSidebarPanel;
-
</del><span class="cx">         remoteObject.release();
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDebuggerTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js (183332 => 183333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js        2015-04-26 01:21:38 UTC (rev 183332)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js        2015-04-26 01:22:10 UTC (rev 183333)
</span><span class="lines">@@ -54,6 +54,15 @@
</span><span class="cx">             return false;
</span><span class="cx"> 
</span><span class="cx">         return representedObject.type === WebInspector.Resource.Type.Document || representedObject.type === WebInspector.Resource.Type.Script;
</span><ins>+    },
+
+    revealAndSelectBreakpoint: function(breakpoint)
+    {
+        console.assert(breakpoint instanceof WebInspector.Breakpoint);
+
+        var treeElement = this.navigationSidebarPanel.treeElementForRepresentedObject(breakpoint);
+        if (treeElement)
+            treeElement.revealAndSelect();
</ins><span class="cx">     }
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDefaultDashboardViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.js (183332 => 183333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.js        2015-04-26 01:21:38 UTC (rev 183332)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.js        2015-04-26 01:22:10 UTC (rev 183333)
</span><span class="lines">@@ -33,19 +33,19 @@
</span><span class="cx"> 
</span><span class="cx">         this._items = {
</span><span class="cx">             resourcesCount: {
</span><del>-                tooltip: WebInspector.UIString(&quot;Total number of resources, click to show the Resources navigation sidebar&quot;),
</del><ins>+                tooltip: WebInspector.UIString(&quot;Total number of resources, click to show the Resources tab&quot;),
</ins><span class="cx">                 handler: this._resourcesWasClicked
</span><span class="cx">             },
</span><span class="cx">             logs: {
</span><del>-                tooltip: WebInspector.UIString(&quot;Console logs, click to show the Console&quot;),
</del><ins>+                tooltip: WebInspector.UIString(&quot;Console logs, click to show the Console tab&quot;),
</ins><span class="cx">                 handler: this._consoleItemWasClicked.bind(this, WebInspector.LogContentView.Scopes.Logs)
</span><span class="cx">             },
</span><span class="cx">             errors: {
</span><del>-                tooltip: WebInspector.UIString(&quot;Console errors, click to show the Console&quot;),
</del><ins>+                tooltip: WebInspector.UIString(&quot;Console errors, click to show the Console tab&quot;),
</ins><span class="cx">                 handler: this._consoleItemWasClicked.bind(this, WebInspector.LogContentView.Scopes.Errors)
</span><span class="cx">             },
</span><span class="cx">             issues: {
</span><del>-                tooltip: WebInspector.UIString(&quot;Console warnings, click to show the Console&quot;),
</del><ins>+                tooltip: WebInspector.UIString(&quot;Console warnings, click to show the Console tab&quot;),
</ins><span class="cx">                 handler: this._consoleItemWasClicked.bind(this, WebInspector.LogContentView.Scopes.Warnings)
</span><span class="cx">             }
</span><span class="cx">         };
</span><span class="lines">@@ -111,15 +111,9 @@
</span><span class="cx"> 
</span><span class="cx">     _resourcesWasClicked()
</span><span class="cx">     {
</span><del>-        WebInspector.navigationSidebar.selectedSidebarPanel = WebInspector.resourceSidebarPanel;
-        WebInspector.navigationSidebar.collapsed = false;
</del><ins>+        WebInspector.showResourcesTab();
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-    _networkItemWasClicked()
-    {
-        WebInspector.navigationSidebar.selectedSidebarPanel = WebInspector.timelineSidebarPanel;
-    }
-
</del><span class="cx">     _consoleItemWasClicked(scope)
</span><span class="cx">     {
</span><span class="cx">         WebInspector.showConsoleTab(scope);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (183332 => 183333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js        2015-04-26 01:21:38 UTC (rev 183332)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js        2015-04-26 01:22:10 UTC (rev 183333)
</span><span class="lines">@@ -987,10 +987,7 @@
</span><span class="cx"> 
</span><span class="cx">         function revealInSidebar()
</span><span class="cx">         {
</span><del>-            WebInspector.debuggerSidebarPanel.show();
-            var treeElement = WebInspector.debuggerSidebarPanel.treeElementForRepresentedObject(breakpoint);
-            if (treeElement)
-                treeElement.revealAndSelect();
</del><ins>+            WebInspector.showDebuggerTab(breakpoint);
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         var contextMenu = new WebInspector.ContextMenu(event);
</span><span class="lines">@@ -1036,7 +1033,7 @@
</span><span class="cx"> 
</span><span class="cx">             breakpoint.appendContextMenuItems(contextMenu, event.target);
</span><span class="cx">             contextMenu.appendSeparator();
</span><del>-            contextMenu.appendItem(WebInspector.UIString(&quot;Reveal in Debugger Navigation Sidebar&quot;), revealInSidebar);
</del><ins>+            contextMenu.appendItem(WebInspector.UIString(&quot;Reveal in Debugger Tab&quot;), revealInSidebar);
</ins><span class="cx">             contextMenu.show();
</span><span class="cx">             return;
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTabBrowserjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js (183332 => 183333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js        2015-04-26 01:21:38 UTC (rev 183332)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js        2015-04-26 01:22:10 UTC (rev 183333)
</span><span class="lines">@@ -92,6 +92,18 @@
</span><span class="cx">         this._contentViewContainer.updateLayout();
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    bestTabContentViewForClass(constructor)
+    {
+        console.assert(!this.selectedTabContentView || this.selectedTabContentView === this._recentTabContentViews[0]);
+
+        for (var tabContentView of this._recentTabContentViews) {
+            if (tabContentView instanceof constructor)
+                return tabContentView;
+        }
+
+        return null;
+    }
+
</ins><span class="cx">     bestTabContentViewForRepresentedObject(representedObject)
</span><span class="cx">     {
</span><span class="cx">         console.assert(!this.selectedTabContentView || this.selectedTabContentView === this._recentTabContentViews[0]);
</span></span></pre>
</div>
</div>

</body>
</html>