sandbox - move contextMenuService

src/vs/code/electron-browser/issue/issueReporterMain.ts

@@ -27,7 +27,7 @@ import { EnvironmentService, INativeEnvironmentService } from 'vs/platform/envir
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
-import { MainProcessService } from 'vs/platform/ipc/electron-browser/mainProcessService';
+import { MainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
 import { ISharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';
 import { ISettingsSearchIssueReporterData, IssueReporterData, IssueReporterExtensionData, IssueReporterFeatures, IssueReporterStyles, IssueType } from 'vs/platform/issue/common/issue';
 import { getLogLevel, ILogService } from 'vs/platform/log/common/log';

src/vs/code/electron-browser/preload.js

@@ -7,7 +7,7 @@
 (function () {
 	'use strict';
 
-	const { ipcRenderer } = require('electron');
+	const { ipcRenderer, webFrame } = require('electron');
 
 	// @ts-ignore
 	window.vscode = {
@@ -15,6 +15,8 @@
 		/**
 		 * A minimal set of methods exposed from ipcRenderer
 		 * to support communication to electron-main
+		 *
+		 * @type {typeof import('../../base/electron-sandbox/globals').ipcRenderer}
 		 */
 		ipcRenderer: {
 
@@ -38,6 +40,16 @@
 				ipcRenderer.on(channel, listener);
 			},
 
+			/**
+			 * @param {string} channel
+			 * @param {(event: import('electron').IpcRendererEvent, ...args: any[]) => void} listener
+			 */
+			once(channel, listener) {
+				validateIPC(channel);
+
+				ipcRenderer.once(channel, listener);
+			},
+
 			/**
 			 * @param {string} channel
 			 * @param {(event: import('electron').IpcRendererEvent, ...args: any[]) => void} listener
@@ -47,6 +59,18 @@
 
 				ipcRenderer.removeListener(channel, listener);
 			}
+		},
+
+		/**
+		 * Support for methods of webFrame type.
+		 *
+		 * @type {typeof import('../../base/electron-sandbox/globals').webFrame}
+		 */
+		webFrame: {
+
+			getZoomFactor() {
+				return webFrame.getZoomFactor();
+			}
 		}
 	};
 

src/vs/code/electron-browser/processExplorer/processExplorerMain.ts

@@ -13,7 +13,7 @@ import { ProcessExplorerStyles, ProcessExplorerData } from 'vs/platform/issue/co
 import * as browser from 'vs/base/browser/browser';
 import * as platform from 'vs/base/common/platform';
 import { IContextMenuItem } from 'vs/base/parts/contextmenu/common/contextmenu';
-import { popup } from 'vs/base/parts/contextmenu/electron-browser/contextmenu';
+import { popup } from 'vs/base/parts/contextmenu/electron-sandbox/contextmenu';
 import { ProcessItem } from 'vs/base/common/processes';
 import { addDisposableListener } from 'vs/base/browser/dom';
 import { DisposableStore } from 'vs/base/common/lifecycle';

src/vs/code/electron-main/window.ts

@@ -779,7 +779,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 	}
 
 	private doGetPreloadUrl(): string {
-		return `${require.toUrl('vs/code/electron-browser/workbench/preload.js')}`;
+		return require.toUrl('vs/code/electron-browser/preload.js');
 	}
 
 	serializeWindowState(): IWindowState {