[Global] Update refs to Extensions.extensionServer

Bug: 1006759
Change-Id: I02ffa1cec02486a399018c1fd8c2efbd4622af7a
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2019553
Commit-Queue: Paul Lewis <aerotwist@chromium.org>
Reviewed-by: Tim van der Lippe <tvanderlippe@chromium.org>
This commit is contained in:
Paul Lewis
2020-01-24 16:32:55 +00:00
committed by Commit Bot
parent 0935d19af6
commit 396d0b9b9b
10 changed files with 19 additions and 19 deletions
+2 -2
View File
@@ -96,7 +96,7 @@ export class ElementsPanel extends UI.Panel {
self.Common.settings.moduleSetting('showUAShadowDOM').addChangeListener(this._showUAShadowDOMChanged.bind(this));
self.SDK.targetManager.addModelListener(
SDK.DOMModel, SDK.DOMModel.Events.DocumentUpdated, this._documentUpdatedEvent, this);
Extensions.extensionServer.addEventListener(
self.Extensions.extensionServer.addEventListener(
Extensions.ExtensionServer.Events.SidebarPaneAdded, this._extensionSidebarPaneAdded, this);
/**
@@ -813,7 +813,7 @@ export class ElementsPanel extends UI.Panel {
}
this._splitMode = splitMode;
const extensionSidebarPanes = Extensions.extensionServer.sidebarPanes();
const extensionSidebarPanes = self.Extensions.extensionServer.sidebarPanes();
let lastSelectedTabId = null;
if (this.sidebarPaneView) {
lastSelectedTabId = this.sidebarPaneView.tabbedPane().selectedTabId;
+1 -1
View File
@@ -723,7 +723,7 @@ export class ExtensionServer extends Common.Object {
// See ExtensionAPI.js for details.
const injectedAPI = self.buildExtensionAPIInjectedScript(
extensionInfo, this._inspectedTabId, UI.themeSupport.themeName(),
self.UI.shortcutRegistry.globalShortcutKeys(), Extensions.extensionServer['_extensionAPITestHook']);
self.UI.shortcutRegistry.globalShortcutKeys(), self.Extensions.extensionServer['_extensionAPITestHook']);
Host.InspectorFrontendHost.setInjectedScriptForOrigin(extensionOrigin, injectedAPI);
this._registeredExtensions[extensionOrigin] = {name: name};
}
@@ -24,11 +24,11 @@ export class ExtensionTraceProvider {
*/
start(session) {
const sessionId = String(++_lastSessionId);
Extensions.extensionServer.startTraceRecording(this._id, sessionId, session);
self.Extensions.extensionServer.startTraceRecording(this._id, sessionId, session);
}
stop() {
Extensions.extensionServer.stopTraceRecording(this._id);
self.Extensions.extensionServer.stopTraceRecording(this._id);
}
/**
+1 -1
View File
@@ -34,4 +34,4 @@ Extensions.TracingSession = ExtensionsModule.ExtensionTraceProvider.TracingSessi
Extensions.ExtensionStatus.Record;
/** @type {!Extensions.ExtensionServer} */
Extensions.extensionServer;
self.Extensions.extensionServer;
@@ -8,23 +8,23 @@
*/
const extensionsHost = 'devtools-extensions.oopif.test';
Extensions.extensionServer._registerHandler('evaluateForTestInFrontEnd', onEvaluate);
self.Extensions.extensionServer._registerHandler('evaluateForTestInFrontEnd', onEvaluate);
Extensions.extensionsOrigin = `http://${extensionsHost}:8000`;
Extensions.extensionServer._extensionAPITestHook = function(extensionServerClient, coreAPI) {
self.Extensions.extensionServer._extensionAPITestHook = function(extensionServerClient, coreAPI) {
window.webInspector = coreAPI;
window._extensionServerForTests = extensionServerClient;
coreAPI.panels.themeName = 'themeNameForTest';
};
ExtensionsTestRunner._replyToExtension = function(requestId, port) {
Extensions.extensionServer._dispatchCallback(requestId, port);
self.Extensions.extensionServer._dispatchCallback(requestId, port);
};
function onEvaluate(message, port) {
// Note: reply(...) is actually used in eval strings
// eslint-disable-next-line no-unused-vars
function reply(param) {
Extensions.extensionServer._dispatchCallback(message.requestId, port, param);
self.Extensions.extensionServer._dispatchCallback(message.requestId, port, param);
}
try {
@@ -58,7 +58,7 @@ ExtensionsTestRunner.runExtensionTests = async function(tests) {
let extensionURL = pageURL.replace(/^(https?:\/\/[^\/]*\/).*$/, '$1') + 'devtools/resources/extension-main.html';
extensionURL = extensionURL.replace('127.0.0.1', extensionsHost);
Extensions.extensionServer._addExtension(
self.Extensions.extensionServer._addExtension(
{startPage: extensionURL, name: 'test extension', exposeWebInspectorNamespace: true});
};
+2 -2
View File
@@ -220,7 +220,7 @@ export class MainImpl {
new Bindings.DebuggerWorkspaceBinding(self.SDK.targetManager, self.Workspace.workspace);
self.Bindings.breakpointManager = new Bindings.BreakpointManager(
self.Workspace.workspace, self.SDK.targetManager, self.Bindings.debuggerWorkspaceBinding);
Extensions.extensionServer = new Extensions.ExtensionServer();
self.Extensions.extensionServer = new Extensions.ExtensionServer();
new Persistence.FileSystemWorkspaceBinding(self.Persistence.isolatedFileSystemManager, self.Workspace.workspace);
self.Persistence.persistence =
@@ -304,7 +304,7 @@ export class MainImpl {
_lateInitialization() {
MainImpl.time('Main._lateInitialization');
this._registerShortcuts();
Extensions.extensionServer.initializeExtensions();
self.Extensions.extensionServer.initializeExtensions();
const extensions = self.runtime.extensions('late-initialization');
const promises = [];
for (const extension of extensions) {
+2 -2
View File
@@ -134,7 +134,7 @@ export class SourcesPanel extends UI.Panel {
self.SDK.targetManager.addModelListener(
SDK.DebuggerModel, SDK.DebuggerModel.Events.GlobalObjectCleared,
event => this._debuggerResumed(/** @type {!SDK.DebuggerModel} */ (event.data)));
Extensions.extensionServer.addEventListener(
self.Extensions.extensionServer.addEventListener(
Extensions.ExtensionServer.Events.SidebarPaneAdded, this._extensionSidebarPaneAdded, this);
self.SDK.targetManager.observeTargets(this);
}
@@ -980,7 +980,7 @@ export class SourcesPanel extends UI.Panel {
}
this._sidebarPaneStack.appendApplicableItems('sources.sidebar-bottom');
const extensionSidebarPanes = Extensions.extensionServer.sidebarPanes();
const extensionSidebarPanes = self.Extensions.extensionServer.sidebarPanes();
for (let i = 0; i < extensionSidebarPanes.length; ++i) {
this._addExtensionSidebarPane(extensionSidebarPanes[i]);
}
+1 -1
View File
@@ -266,7 +266,7 @@ export class TabbedEditorContainer extends Common.Object {
this._history.updateSelectionRange(this._currentFile.url(), range);
this._history.save(this._previouslyViewedFilesSetting);
Extensions.extensionServer.sourceSelectionChanged(this._currentFile.url(), range);
self.Extensions.extensionServer.sourceSelectionChanged(this._currentFile.url(), range);
}
/**
+1 -1
View File
@@ -48,7 +48,7 @@ export class TimelineController {
* @return {!Promise<!Object>}
*/
async startRecording(options, providers) {
this._extensionTraceProviders = Extensions.extensionServer.traceProviders().slice();
this._extensionTraceProviders = self.Extensions.extensionServer.traceProviders().slice();
/**
* @param {string} category
+2 -2
View File
@@ -131,7 +131,7 @@ export class TimelinePanel extends UI.Panel {
this._showLandingPage();
this._updateTimelineControls();
Extensions.extensionServer.addEventListener(
self.Extensions.extensionServer.addEventListener(
Extensions.ExtensionServer.Events.TraceProviderAdded, this._appendExtensionsToToolbar, this);
self.SDK.targetManager.addEventListener(
SDK.TargetManager.Events.SuspendStateChanged, this._onSuspendStateChanged, this);
@@ -535,7 +535,7 @@ export class TimelinePanel extends UI.Panel {
this._showRecordingStarted();
const enabledTraceProviders = Extensions.extensionServer.traceProviders().filter(
const enabledTraceProviders = self.Extensions.extensionServer.traceProviders().filter(
provider => TimelinePanel._settingForTraceProvider(provider).get());
const mainTarget = /** @type {!SDK.Target} */ (self.SDK.targetManager.mainTarget());