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

sandbox - ensure IElectronService is declared from electron-sandbox layer

Browse Source
This commit is contained in:
Benjamin Pasero
2020-05-25 12:41:39 +02:00
parent 231bee5c77
commit 7f34cb5384
44 changed files with 58 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,7 @@ import { IUserDataSyncService, IUserDataSyncStoreService, registerConfiguration,
import { UserDataSyncService } from 'vs/platform/userDataSync/common/userDataSyncService';
import { UserDataSyncStoreService } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
import { UserDataSyncChannel, UserDataSyncUtilServiceClient, UserDataAutoSyncChannel, StorageKeysSyncRegistryChannelClient, UserDataSyncMachinesServiceChannel } from 'vs/platform/userDataSync/common/userDataSyncIpc';
import { IElectronService } from 'vs/platform/electron/common/electron';
import { IElectronService } from 'vs/platform/electron/electron-sandbox/electron';
import { LoggerService } from 'vs/platform/log/node/loggerService';
import { UserDataSyncLogService } from 'vs/platform/userDataSync/common/userDataSyncLog';
import { ICredentialsService } from 'vs/platform/credentials/common/credentials';

2
src/vs/code/electron-main/app.ts
View File

@@ -8,7 +8,7 @@ import { IProcessEnvironment, isWindows, isMacintosh } from 'vs/base/common/plat
import { WindowsMainService } from 'vs/platform/windows/electron-main/windowsMainService';
import { IWindowOpenable } from 'vs/platform/windows/common/windows';
import { OpenContext } from 'vs/platform/windows/node/window';
import { ActiveWindowManager } from 'vs/code/node/activeWindowTracker';
import { ActiveWindowManager } from 'vs/code/electron-main/windows';
import { ILifecycleMainService, LifecycleMainPhase } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
import { getShellEnvironment } from 'vs/code/node/shellEnv';
import { IUpdateService } from 'vs/platform/update/common/update';

6
src/vs/code/node/activeWindowTracker.ts → src/vs/code/electron-main/windows.ts
View File

@@ -6,7 +6,7 @@
import { Event } from 'vs/base/common/event';
import { DisposableStore, Disposable } from 'vs/base/common/lifecycle';
import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
import { IElectronService } from 'vs/platform/electron/common/electron';
import { IElectronMainService } from 'vs/platform/electron/electron-main/electronMainService';
export class ActiveWindowManager extends Disposable {
@@ -15,7 +15,7 @@ export class ActiveWindowManager extends Disposable {
private activeWindowId: number | undefined;
constructor(@IElectronService electronService: IElectronService) {
constructor(@IElectronMainService electronService: IElectronMainService) {
super();
// remember last active window id upon events
@@ -23,7 +23,7 @@ export class ActiveWindowManager extends Disposable {
onActiveWindowChange(this.setActiveWindow, this, this.disposables);
// resolve current active window
this.firstActiveWindowIdPromise = createCancelablePromise(() => electronService.getActiveWindowId());
this.firstActiveWindowIdPromise = createCancelablePromise(() => electronService.getActiveWindowId(-1));
(async () => {
try {
const windowId = await this.firstActiveWindowIdPromise;