third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js - Issue 1564113003: DevTools: merge uisourcecode's url-alike members.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js

Issue 1564113003: DevTools: merge uisourcecode's url-alike members. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review comments addressed Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/emulation/MediaQueryInspector.js ('k') | third_party/WebKit/Source/devtools/front_end/main/FrontendWebSocketAPI.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js

diff --git a/third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js b/third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js

index 430108ff5f897f944ec8b67023cef8b18df75d6c..4b3bfedf421cb0ddaa79742cb1443fb3b5af7f73 100644

--- a/third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js

+++ b/third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js

@@ -406,7 +406,7 @@ WebInspector.ExtensionServer.prototype = {

_handleOpenURL: function(port, details)

{

var url = /** @type {string} */ (details.url);

- var contentProvider = WebInspector.workspace.uiSourceCodeForOriginURL(url) || WebInspector.resourceForURL(url);

+ var contentProvider = WebInspector.workspace.uiSourceCodeForURL(url) || WebInspector.resourceForURL(url);

if (!contentProvider)

return false;

@@ -538,7 +538,7 @@ WebInspector.ExtensionServer.prototype = {

_onGetResourceContent: function(message, port)

{

var url = /** @type {string} */ (message.url);

- var contentProvider = WebInspector.workspace.uiSourceCodeForOriginURL(url) || WebInspector.resourceForURL(url);

+ var contentProvider = WebInspector.workspace.uiSourceCodeForURL(url) || WebInspector.resourceForURL(url);

if (!contentProvider)

return this._status.E_NOTFOUND(url);

this._getResourceContent(contentProvider, message, port);

@@ -557,7 +557,7 @@ WebInspector.ExtensionServer.prototype = {

}

var url = /** @type {string} */ (message.url);

- var uiSourceCode = WebInspector.workspace.uiSourceCodeForOriginURL(url);

+ var uiSourceCode = WebInspector.workspace.uiSourceCodeForURL(url);

if (!uiSourceCode || !uiSourceCode.contentType().isDocumentOrScriptOrStyleSheet()) {

var resource = WebInspector.ResourceTreeModel.resourceForURL(url);

if (!resource)