Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-03 15:01:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into electron-2.0.x

Browse Source
This commit is contained in:
Benjamin Pasero
2018-07-17 12:17:10 +02:00
parent 678f2e9c16 18b5d32140
commit eda3157386
115 changed files with 1261 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
View File

@@ -43,7 +43,6 @@ import { LocalizationsChannel } from 'vs/platform/localizations/common/localizat
import { DialogChannelClient } from 'vs/platform/dialogs/common/dialogIpc';
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { DefaultURITransformer } from 'vs/base/common/uriIpc';
export interface ISharedProcessConfiguration {
readonly machineId: string;
@@ -123,7 +122,7 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
instantiationService2.invokeFunction(accessor => {
const extensionManagementService = accessor.get(IExtensionManagementService);
const channel = new ExtensionManagementChannel(extensionManagementService, DefaultURITransformer);
const channel = new ExtensionManagementChannel(extensionManagementService);
server.registerChannel('extensions', channel);
// clean up deprecated extensions