debt - restore old layer name (#250928)

.eslint-plugin-local/code-import-patterns.ts

@@ -18,7 +18,7 @@ interface ConditionalPattern {
 
 interface RawImportPatternsConfig {
 	target: string;
-	layer?: 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-utility' | 'electron-main';
+	layer?: 'common' | 'worker' | 'browser' | 'electron-browser' | 'node' | 'electron-utility' | 'electron-main';
 	test?: boolean;
 	restrictions: string | (string | ConditionalPattern)[];
 }
@@ -80,7 +80,7 @@ export = new class implements eslint.Rule.RuleModule {
 			return this._optionsCache.get(options)!;
 		}
 
-		type Layer = 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-utility' | 'electron-main';
+		type Layer = 'common' | 'worker' | 'browser' | 'electron-browser' | 'node' | 'electron-utility' | 'electron-main';
 
 		interface ILayerRule {
 			layer: Layer;
@@ -98,7 +98,7 @@ export = new class implements eslint.Rule.RuleModule {
 			{ layer: 'common', deps: orSegment(['common']) },
 			{ layer: 'worker', deps: orSegment(['common', 'worker']) },
 			{ layer: 'browser', deps: orSegment(['common', 'browser']), isBrowser: true },
-			{ layer: 'electron-sandbox', deps: orSegment(['common', 'browser', 'electron-sandbox']), isBrowser: true },
+			{ layer: 'electron-browser', deps: orSegment(['common', 'browser', 'electron-browser']), isBrowser: true },
 			{ layer: 'node', deps: orSegment(['common', 'node']), isNode: true },
 			{ layer: 'electron-utility', deps: orSegment(['common', 'node', 'electron-utility']), isNode: true, isElectron: true },
 			{ layer: 'electron-main', deps: orSegment(['common', 'node', 'electron-utility', 'electron-main']), isNode: true, isElectron: true },

build/buildfile.js

@@ -18,7 +18,7 @@ exports.workerExtensionHost = createModuleDescription('vs/workbench/api/worker/e
 exports.workerNotebook = createModuleDescription('vs/workbench/contrib/notebook/common/services/notebookWebWorkerMain');
 exports.workerLanguageDetection = createModuleDescription('vs/workbench/services/languageDetection/browser/languageDetectionWebWorkerMain');
 exports.workerLocalFileSearch = createModuleDescription('vs/workbench/services/search/worker/localFileSearchMain');
-exports.workerProfileAnalysis = createModuleDescription('vs/platform/profiling/electron-sandbox/profileAnalysisWorkerMain');
+exports.workerProfileAnalysis = createModuleDescription('vs/platform/profiling/electron-browser/profileAnalysisWorkerMain');
 exports.workerOutputLinks = createModuleDescription('vs/workbench/contrib/output/common/outputLinkComputerMain');
 exports.workerBackgroundTokenization = createModuleDescription('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.workerMain');
 
@@ -43,7 +43,7 @@ exports.code = [
 	// 'vs/code/node/cli' is not included here because it comes in via ./src/cli.js
 	createModuleDescription('vs/code/node/cliProcessMain'),
 	createModuleDescription('vs/code/electron-utility/sharedProcess/sharedProcessMain'),
-	createModuleDescription('vs/code/electron-sandbox/workbench/workbench'),
+	createModuleDescription('vs/code/electron-browser/workbench/workbench'),
 	createModuleDescription('vs/workbench/contrib/webview/browser/pre/service-worker')
 ];
 

build/checker/layersChecker.js

@@ -53,9 +53,9 @@ const RULES = [
         ].join(',')}}`,
         disallowedTypes: [ /* Ignore native types that are defined from here */],
     },
-    // Common: vs/base/parts/sandbox/electron-sandbox/preload{,-aux}.ts
+    // Common: vs/base/parts/sandbox/electron-browser/preload{,-aux}.ts
     {
-        target: '**/vs/base/parts/sandbox/electron-sandbox/preload{,-aux}.ts',
+        target: '**/vs/base/parts/sandbox/electron-browser/preload{,-aux}.ts',
         disallowedTypes: NATIVE_TYPES,
     },
     // Common
@@ -63,6 +63,11 @@ const RULES = [
         target: '**/vs/**/common/**',
         disallowedTypes: NATIVE_TYPES,
     },
+    // Common
+    {
+        target: '**/vs/**/worker/**',
+        disallowedTypes: NATIVE_TYPES,
+    },
     // Browser
     {
         target: '**/vs/**/browser/**',

build/checker/layersChecker.ts

@@ -55,9 +55,9 @@ const RULES: IRule[] = [
 		disallowedTypes: [/* Ignore native types that are defined from here */],
 	},
 
-	// Common: vs/base/parts/sandbox/electron-sandbox/preload{,-aux}.ts
+	// Common: vs/base/parts/sandbox/electron-browser/preload{,-aux}.ts
 	{
-		target: '**/vs/base/parts/sandbox/electron-sandbox/preload{,-aux}.ts',
+		target: '**/vs/base/parts/sandbox/electron-browser/preload{,-aux}.ts',
 		disallowedTypes: NATIVE_TYPES,
 	},
 
@@ -67,6 +67,12 @@ const RULES: IRule[] = [
 		disallowedTypes: NATIVE_TYPES,
 	},
 
+	// Common
+	{
+		target: '**/vs/**/worker/**',
+		disallowedTypes: NATIVE_TYPES,
+	},
+
 	// Browser
 	{
 		target: '**/vs/**/browser/**',

build/checker/tsconfig.browser.json

@@ -11,6 +11,7 @@
 		"skipLibCheck": true
 	},
 	"include": [
+		"../../src/*.ts",
 		"../../src/**/common/**/*.ts",
 		"../../src/**/browser/**/*.ts",
 		"../../src/typings/*.d.ts",

build/checker/tsconfig.electron-browser.json

@@ -3,7 +3,7 @@
 	"include": [
 		"../../src/**/common/**/*.ts",
 		"../../src/**/browser/**/*.ts",
-		"../../src/**/electron-sandbox/**/*.ts",
+		"../../src/**/electron-browser/**/*.ts",
 		"../../src/typings/*.d.ts",
 		"../../src/vs/monaco.d.ts",
 		"../../src/vscode-dts/vscode.proposed.*.d.ts",
@@ -15,7 +15,7 @@
 	"exclude": [
 		"../../src/**/test/**",
 		"../../src/**/fixtures/**",
-		"../../src/vs/base/parts/sandbox/electron-sandbox/preload.ts", 		// Preload scripts for Electron sandbox
-		"../../src/vs/base/parts/sandbox/electron-sandbox/preload-aux.ts"	// have limited access to node.js APIs
+		"../../src/vs/base/parts/sandbox/electron-browser/preload.ts", 		// Preload scripts for Electron sandbox
+		"../../src/vs/base/parts/sandbox/electron-browser/preload-aux.ts"	// have limited access to node.js APIs
 	]
 }

build/checker/tsconfig.electron-main.json

@@ -1,9 +1,13 @@
 {
 	"extends": "./tsconfig.node.json",
 	"include": [
+		"../../src/**/common/**/*.ts",
+		"../../src/**/node/**/*.ts",
 		"../../src/**/electron-main/**/*.ts",
-		"../../src/**/electron-utility/**/*.ts",
 		"../../src/typings/*.d.ts",
+		"../../src/vs/monaco.d.ts",
+		"../../src/vscode-dts/vscode.proposed.*.d.ts",
+		"../../src/vscode-dts/vscode.d.ts",
 		"../../node_modules/@types/trusted-types/index.d.ts",
 	],
 	"exclude": [

build/checker/tsconfig.electron-utility.json

@@ -0,0 +1,17 @@
+{
+	"extends": "./tsconfig.node.json",
+	"include": [
+		"../../src/**/common/**/*.ts",
+		"../../src/**/node/**/*.ts",
+		"../../src/**/electron-utility/**/*.ts",
+		"../../src/typings/*.d.ts",
+		"../../src/vs/monaco.d.ts",
+		"../../src/vscode-dts/vscode.proposed.*.d.ts",
+		"../../src/vscode-dts/vscode.d.ts",
+		"../../node_modules/@types/trusted-types/index.d.ts",
+	],
+	"exclude": [
+		"../../src/**/test/**",
+		"../../src/**/fixtures/**",
+	]
+}

build/checker/tsconfig.node.json

@@ -11,6 +11,7 @@
 		"skipLibCheck": true
 	},
 	"include": [
+		"../../src/*.ts",
 		"../../src/**/common/**/*.ts",
 		"../../src/**/node/**/*.ts",
 		"../../src/typings/*.d.ts",

build/checker/tsconfig.worker.json

@@ -0,0 +1,28 @@
+{
+	"extends": "../../src/tsconfig.base.json",
+	"compilerOptions": {
+		"lib": [
+			"ES2022",
+			"WebWorker",
+			"Webworker.Iterable",
+			"WebWorker.AsyncIterable"
+		],
+		"types": [],
+		"noEmit": true,
+		"skipLibCheck": true
+	},
+	"include": [
+		"../../src/**/common/**/*.ts",
+		"../../src/**/worker/**/*.ts",
+		"../../src/typings/*.d.ts",
+		"../../src/vs/monaco.d.ts",
+		"../../src/vscode-dts/vscode.proposed.*.d.ts",
+		"../../src/vscode-dts/vscode.d.ts",
+		"../../node_modules/@types/trusted-types/index.d.ts",
+		"../../node_modules/@types/wicg-file-system-access/index.d.ts"
+	],
+	"exclude": [
+		"../../src/**/test/**",
+		"../../src/**/fixtures/**"
+	]
+}

build/gulpfile.reh.js

@@ -80,7 +80,7 @@ const serverResourceIncludes = [
 ];
 
 const serverResourceExcludes = [
-	'!out-build/vs/**/{electron-sandbox,electron-main,electron-utility}/**',
+	'!out-build/vs/**/{electron-browser,electron-main,electron-utility}/**',
 	'!out-build/vs/editor/standalone/**',
 	'!out-build/vs/workbench/**/*-tb.png',
 	'!**/test/**'

build/gulpfile.vscode.js

@@ -57,11 +57,11 @@ const vscodeResourceIncludes = [
 	'out-build/nls.keys.json',
 
 	// Workbench
-	'out-build/vs/code/electron-sandbox/workbench/workbench.html',
+	'out-build/vs/code/electron-browser/workbench/workbench.html',
 
 	// Electron Preload
-	'out-build/vs/base/parts/sandbox/electron-sandbox/preload.js',
-	'out-build/vs/base/parts/sandbox/electron-sandbox/preload-aux.js',
+	'out-build/vs/base/parts/sandbox/electron-browser/preload.js',
+	'out-build/vs/base/parts/sandbox/electron-browser/preload-aux.js',
 
 	// Node Scripts
 	'out-build/vs/base/node/{terminateProcess.sh,cpuUsage.sh,ps.sh}',
@@ -138,7 +138,7 @@ const bundleVSCodeTask = task.define('bundle-vscode', task.series(
 					...bootstrapEntryPoints
 				],
 				resources: vscodeResources,
-				skipTSBoilerplateRemoval: entryPoint => entryPoint === 'vs/code/electron-sandbox/workbench/workbench'
+				skipTSBoilerplateRemoval: entryPoint => entryPoint === 'vs/code/electron-browser/workbench/workbench'
 			}
 		}
 	)
@@ -220,12 +220,12 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		const out = sourceFolderName;
 
 		const checksums = computeChecksums(out, [
-			'vs/base/parts/sandbox/electron-sandbox/preload.js',
+			'vs/base/parts/sandbox/electron-browser/preload.js',
 			'vs/workbench/workbench.desktop.main.js',
 			'vs/workbench/workbench.desktop.main.css',
 			'vs/workbench/api/node/extensionHostProcess.js',
-			'vs/code/electron-sandbox/workbench/workbench.html',
-			'vs/code/electron-sandbox/workbench/workbench.js'
+			'vs/code/electron-browser/workbench/workbench.html',
+			'vs/code/electron-browser/workbench/workbench.js'
 		]);
 
 		const src = gulp.src(out + '/**', { base: '.' })

build/gulpfile.vscode.web.js

@@ -66,7 +66,7 @@ const vscodeWebResources = [
 	...vscodeWebResourceIncludes,
 
 	// Excludes
-	'!out-build/vs/**/{node,electron-sandbox,electron-main,electron-utility}/**',
+	'!out-build/vs/**/{node,electron-browser,electron-main,electron-utility}/**',
 	'!out-build/vs/editor/standalone/**',
 	'!out-build/vs/workbench/**/*-tb.png',
 	'!out-build/vs/code/**/*-dev.html',

eslint.config.js

@@ -99,7 +99,7 @@ export default tseslint.config(
 					'browser': [
 						'common'
 					],
-					'electron-sandbox': [
+					'electron-browser': [
 						'common',
 						'browser'
 					],
@@ -406,10 +406,10 @@ export default tseslint.config(
 			]
 		}
 	},
-	// browser/electron-sandbox layer
+	// browser/electron-browser layer
 	{
 		files: [
-			'src/**/{browser,electron-sandbox}/**/*.ts'
+			'src/**/{browser,electron-browser}/**/*.ts'
 		],
 		languageOptions: {
 			parser: tseslint.parser,
@@ -770,7 +770,7 @@ export default tseslint.config(
 				{
 					// imports that are allowed in all files of layers:
 					// - browser
-					// - electron-sandbox
+					// - electron-browser
 					'when': 'hasBrowser',
 					'allow': []
 				},
@@ -866,18 +866,18 @@ export default tseslint.config(
 				//  - src/vs/base/common
 				//  - src/vs/base/worker
 				//  - src/vs/base/browser
-				//  - src/vs/base/electron-sandbox
+				//  - src/vs/base/electron-browser
 				//  - src/vs/base/node
 				//  - src/vs/base/electron-main
 				//  - src/vs/base/test/common
 				//  - src/vs/base/test/worker
 				//  - src/vs/base/test/browser
-				//  - src/vs/base/test/electron-sandbox
+				//  - src/vs/base/test/electron-browser
 				//  - src/vs/base/test/node
 				//  - src/vs/base/test/electron-main
 				//
 				// When /~ is used in the restrictions, it will be replaced with the correct
-				// layers that can be used e.g. 'src/vs/base/electron-sandbox' will be able
+				// layers that can be used e.g. 'src/vs/base/electron-browser' will be able
 				// to import '{common,browser,electron-sanbox}', etc.
 				//
 				// It is possible to use /~ in the restrictions property even without using it in
@@ -1203,7 +1203,7 @@ export default tseslint.config(
 				},
 				{
 					'target': 'src/vs/workbench/workbench.desktop.main.ts',
-					'layer': 'electron-sandbox',
+					'layer': 'electron-browser',
 					'restrictions': [
 						'vs/base/*/~',
 						'vs/base/parts/*/~',

package.json

@@ -44,7 +44,7 @@
     "monaco-compile-check": "tsc -p src/tsconfig.monaco.json --noEmit",
     "tsec-compile-check": "node node_modules/tsec/bin/tsec -p src/tsconfig.tsec.json",
     "vscode-dts-compile-check": "tsc -p src/tsconfig.vscode-dts.json && tsc -p src/tsconfig.vscode-proposed-dts.json",
-    "valid-layers-check": "node build/checker/layersChecker.js && tsc -p build/checker/tsconfig.browser.json && tsc -p build/checker/tsconfig.node.json && tsc -p build/checker/tsconfig.electron-sandbox.json && tsc -p build/checker/tsconfig.electron-main.json",
+    "valid-layers-check": "node build/checker/layersChecker.js && tsc -p build/checker/tsconfig.browser.json && tsc -p build/checker/tsconfig.worker.json && tsc -p build/checker/tsconfig.node.json && tsc -p build/checker/tsconfig.electron-browser.json && tsc -p build/checker/tsconfig.electron-main.json && tsc -p build/checker/tsconfig.electron-utility.json",
     "define-class-fields-check": "node build/lib/propertyInitOrderChecker.js && tsc -p src/tsconfig.defineClassFields.json",
     "update-distro": "node build/npm/update-distro.mjs",
     "web": "echo 'npm run web' is replaced by './scripts/code-server' or './scripts/code-web'",

src/bootstrap-import.ts

@@ -6,7 +6,7 @@
 // *********************************************************************
 // *                                                                   *
 // *  We need this to redirect to node_modules from the remote-folder. *
-// *  This ONLY applies  when running out of source.                   *
+// *  This ONLY applies when running out of source.                   *
 // *                                                                   *
 // *********************************************************************
 

src/tsec.exemptions.json

@@ -1,6 +1,6 @@
 {
 	"ban-document-execcommand": [
-		"vs/workbench/contrib/codeEditor/electron-sandbox/inputClipboardActions.ts",
+		"vs/workbench/contrib/codeEditor/electron-browser/inputClipboardActions.ts",
 		"vs/editor/contrib/clipboard/browser/clipboard.ts"
 	],
 	"ban-eval-calls": [
@@ -12,7 +12,7 @@
 		"vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils.ts"
 	],
 	"ban-trustedtypes-createpolicy": [
-		"vs/code/electron-sandbox/workbench/workbench.ts",
+		"vs/code/electron-browser/workbench/workbench.ts",
 		"vs/amdX.ts",
 		"vs/base/browser/trustedTypes.ts",
 		"vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts"
@@ -37,6 +37,6 @@
 		"**/*.ts"
 	],
 	"ban-script-content-assignments": [
-		"vs/code/electron-sandbox/workbench/workbench.ts"
+		"vs/code/electron-browser/workbench/workbench.ts"
 	]
 }

src/vs/base/parts/contextmenu/electron-browser/contextmenu.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CONTEXT_MENU_CHANNEL, CONTEXT_MENU_CLOSE_CHANNEL, IContextMenuEvent, IContextMenuItem, IPopupOptions, ISerializableContextMenuItem } from '../common/contextmenu.js';
-import { ipcRenderer } from '../../sandbox/electron-sandbox/globals.js';
+import { ipcRenderer } from '../../sandbox/electron-browser/globals.js';
 
 let contextMenuIdPool = 0;
 

src/vs/base/parts/ipc/electron-browser/ipc.electron.ts

@@ -8,7 +8,7 @@ import { Event } from '../../../common/event.js';
 import { IDisposable } from '../../../common/lifecycle.js';
 import { IPCClient } from '../common/ipc.js';
 import { Protocol as ElectronProtocol } from '../common/ipc.electron.js';
-import { ipcRenderer } from '../../sandbox/electron-sandbox/globals.js';
+import { ipcRenderer } from '../../sandbox/electron-browser/globals.js';
 
 /**
  * An implementation of `IPCClient` on top of Electron `ipcRenderer` IPC communication

src/vs/base/parts/ipc/electron-browser/ipc.mp.ts

@@ -6,7 +6,7 @@
 import { mainWindow } from '../../../browser/window.js';
 import { Event } from '../../../common/event.js';
 import { generateUuid } from '../../../common/uuid.js';
-import { ipcMessagePort, ipcRenderer } from '../../sandbox/electron-sandbox/globals.js';
+import { ipcMessagePort, ipcRenderer } from '../../sandbox/electron-browser/globals.js';
 
 interface IMessageChannelResult {
 	nonce: string;

src/vs/base/parts/ipc/electron-main/ipc.mp.ts

@@ -34,7 +34,7 @@ export class Client extends MessagePortClient implements IDisposable {
 /**
  * This method opens a message channel connection
  * in the target window. The target window needs
- * to use the `Server` from `electron-sandbox/ipc.mp`.
+ * to use the `Server` from `electron-browser/ipc.mp`.
  */
 export async function connect(window: BrowserWindow): Promise<MessagePortMain> {
 

src/vs/base/parts/sandbox/electron-browser/electronTypes.ts

@@ -6,7 +6,7 @@
 
 // #######################################################################
 // ###                                                                 ###
-// ###      electron.d.ts types we expose from electron-sandbox        ###
+// ###      electron.d.ts types we expose from electron-browser        ###
 // ###                    (copied from Electron 29.x)                  ###
 // ###                                                                 ###
 // #######################################################################

src/vs/base/parts/sandbox/test/electron-browser/globals.test.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { ipcRenderer, process, webFrame, webUtils } from '../../electron-sandbox/globals.js';
+import { ipcRenderer, process, webFrame, webUtils } from '../../electron-browser/globals.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../test/common/utils.js';
 
 suite('Sandbox', () => {

src/vs/base/test/common/labels.test.ts

@@ -60,7 +60,7 @@ suite('Labels', () => {
 		assert.deepStrictEqual(labels.shorten(['a', 'a\\b', 'a\\b\\c', 'd\\b\\c', 'd\\b']), ['a', 'a\\b', 'a\\b\\c', 'd\\b\\c', 'd\\b']);
 		assert.deepStrictEqual(labels.shorten(['a', 'a\\b', 'b']), ['a', 'a\\b', 'b']);
 		assert.deepStrictEqual(labels.shorten(['', 'a', 'b', 'b\\c', 'a\\c']), ['.\\', 'a', 'b', 'b\\c', 'a\\c']);
-		assert.deepStrictEqual(labels.shorten(['src\\vs\\workbench\\parts\\execution\\electron-sandbox', 'src\\vs\\workbench\\parts\\execution\\electron-sandbox\\something', 'src\\vs\\workbench\\parts\\terminal\\electron-sandbox']), ['…\\execution\\electron-sandbox', '…\\something', '…\\terminal\\…']);
+		assert.deepStrictEqual(labels.shorten(['src\\vs\\workbench\\parts\\execution\\electron-browser', 'src\\vs\\workbench\\parts\\execution\\electron-browser\\something', 'src\\vs\\workbench\\parts\\terminal\\electron-browser']), ['…\\execution\\electron-browser', '…\\something', '…\\terminal\\…']);
 	});
 
 	(isWindows ? test.skip : test)('shorten - not windows', () => {

src/vs/code/electron-browser/workbench/workbench.ts

@@ -11,11 +11,11 @@
 	performance.mark('code/didStartRenderer');
 
 	type ISandboxConfiguration = import('../../../base/parts/sandbox/common/sandboxTypes.js').ISandboxConfiguration;
-	type ILoadResult<M, T extends ISandboxConfiguration> = import('../../../platform/window/electron-sandbox/window.js').ILoadResult<M, T>;
-	type ILoadOptions<T extends ISandboxConfiguration> = import('../../../platform/window/electron-sandbox/window.js').ILoadOptions<T>;
+	type ILoadResult<M, T extends ISandboxConfiguration> = import('../../../platform/window/electron-browser/window.js').ILoadResult<M, T>;
+	type ILoadOptions<T extends ISandboxConfiguration> = import('../../../platform/window/electron-browser/window.js').ILoadOptions<T>;
 	type INativeWindowConfiguration = import('../../../platform/window/common/window.ts').INativeWindowConfiguration;
-	type IMainWindowSandboxGlobals = import('../../../base/parts/sandbox/electron-sandbox/globals.js').IMainWindowSandboxGlobals;
-	type IDesktopMain = import('../../../workbench/electron-sandbox/desktop.main.js').IDesktopMain;
+	type IMainWindowSandboxGlobals = import('../../../base/parts/sandbox/electron-browser/globals.js').IMainWindowSandboxGlobals;
+	type IDesktopMain = import('../../../workbench/electron-browser/desktop.main.js').IDesktopMain;
 
 	const preloadGlobals: IMainWindowSandboxGlobals = (window as any).vscode; // defined by preload.ts
 	const safeProcess = preloadGlobals.process;

src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService.ts

@@ -93,7 +93,7 @@ export class AuxiliaryWindowsMainService extends Disposable implements IAuxiliar
 	createWindow(details: HandlerDetails): BrowserWindowConstructorOptions {
 		const { state, overrides } = this.computeWindowStateAndOverrides(details);
 		return this.instantiationService.invokeFunction(defaultBrowserWindowOptions, state, overrides, {
-			preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-sandbox/preload-aux.js').fsPath
+			preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-browser/preload-aux.js').fsPath
 		});
 	}
 

src/vs/platform/diagnostics/electron-browser/diagnosticsService.ts

@@ -4,6 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IDiagnosticsService } from '../common/diagnostics.js';
-import { registerSharedProcessRemoteService } from '../../ipc/electron-sandbox/services.js';
+import { registerSharedProcessRemoteService } from '../../ipc/electron-browser/services.js';
 
 registerSharedProcessRemoteService(IDiagnosticsService, 'diagnostics');

src/vs/platform/externalTerminal/electron-browser/externalTerminalService.ts

@@ -5,7 +5,7 @@
 
 import { IExternalTerminalService as ICommonExternalTerminalService } from '../common/externalTerminal.js';
 import { createDecorator } from '../../instantiation/common/instantiation.js';
-import { registerMainProcessRemoteService } from '../../ipc/electron-sandbox/services.js';
+import { registerMainProcessRemoteService } from '../../ipc/electron-browser/services.js';
 
 export const IExternalTerminalService = createDecorator<IExternalTerminalService>('externalTerminal');
 

src/vs/platform/ipc/electron-browser/mainProcessService.ts

@@ -5,7 +5,7 @@
 
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { IChannel, IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
-import { Client as IPCElectronClient } from '../../../base/parts/ipc/electron-sandbox/ipc.electron.js';
+import { Client as IPCElectronClient } from '../../../base/parts/ipc/electron-browser/ipc.electron.js';
 import { IMainProcessService } from '../common/mainProcessService.js';
 
 /**

src/vs/platform/profiling/electron-browser/profileAnalysisWorkerService.ts

@@ -49,7 +49,7 @@ class ProfileAnalysisWorkerService implements IProfileAnalysisWorkerService {
 	private async _withWorker<R>(callback: (worker: Proxied<IProfileAnalysisWorker>) => Promise<R>): Promise<R> {
 
 		const worker = createWebWorker<IProfileAnalysisWorker>(
-			FileAccess.asBrowserUri('vs/platform/profiling/electron-sandbox/profileAnalysisWorkerMain.js'),
+			FileAccess.asBrowserUri('vs/platform/profiling/electron-browser/profileAnalysisWorkerMain.js'),
 			'CpuProfileAnalysisWorker'
 		);
 

src/vs/platform/profiling/electron-browser/profilingService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerSharedProcessRemoteService } from '../../ipc/electron-sandbox/services.js';
+import { registerSharedProcessRemoteService } from '../../ipc/electron-browser/services.js';
 import { IV8InspectProfilingService } from '../common/profiling.js';
 
 registerSharedProcessRemoteService(IV8InspectProfilingService, 'v8InspectProfiling');

src/vs/platform/remote/electron-browser/sharedProcessTunnelService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerSharedProcessRemoteService } from '../../ipc/electron-sandbox/services.js';
+import { registerSharedProcessRemoteService } from '../../ipc/electron-browser/services.js';
 import { ISharedProcessTunnelService, ipcSharedProcessTunnelChannelName } from '../common/sharedProcessTunnelService.js';
 
 registerSharedProcessRemoteService(ISharedProcessTunnelService, ipcSharedProcessTunnelChannelName);

src/vs/platform/remote/test/electron-browser/remoteAuthorityResolverService.test.ts

@@ -8,7 +8,7 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/c
 import product from '../../../product/common/product.js';
 import { IProductService } from '../../../product/common/productService.js';
 import { RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode } from '../../common/remoteAuthorityResolver.js';
-import { RemoteAuthorityResolverService } from '../../electron-sandbox/remoteAuthorityResolverService.js';
+import { RemoteAuthorityResolverService } from '../../electron-browser/remoteAuthorityResolverService.js';
 
 suite('RemoteAuthorityResolverService', () => {
 

src/vs/platform/remoteTunnel/electron-browser/remoteTunnelService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerSharedProcessRemoteService } from '../../ipc/electron-sandbox/services.js';
+import { registerSharedProcessRemoteService } from '../../ipc/electron-browser/services.js';
 import { IRemoteTunnelService } from '../common/remoteTunnel.js';
 
 registerSharedProcessRemoteService(IRemoteTunnelService, 'remoteTunnel');

src/vs/platform/telemetry/electron-browser/customEndpointTelemetryService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerSharedProcessRemoteService } from '../../ipc/electron-sandbox/services.js';
+import { registerSharedProcessRemoteService } from '../../ipc/electron-browser/services.js';
 import { ICustomEndpointTelemetryService } from '../common/telemetry.js';
 
 registerSharedProcessRemoteService(ICustomEndpointTelemetryService, 'customEndpointTelemetry');

src/vs/platform/webContentExtractor/electron-browser/webContentExtractorService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { registerMainProcessRemoteService, registerSharedProcessRemoteService } from '../../ipc/electron-sandbox/services.js';
+import { registerMainProcessRemoteService, registerSharedProcessRemoteService } from '../../ipc/electron-browser/services.js';
 import { ISharedWebContentExtractorService, IWebContentExtractorService } from '../common/webContentExtractor.js';
 
 registerMainProcessRemoteService(IWebContentExtractorService, 'webContentExtractor');

src/vs/platform/window/electron-browser/window.ts

@@ -7,7 +7,7 @@ import { getZoomLevel, setZoomFactor, setZoomLevel } from '../../../base/browser
 import { getActiveWindow, getWindows } from '../../../base/browser/dom.js';
 import { mainWindow } from '../../../base/browser/window.js';
 import { ISandboxConfiguration } from '../../../base/parts/sandbox/common/sandboxTypes.js';
-import { ISandboxGlobals, ipcRenderer, webFrame } from '../../../base/parts/sandbox/electron-sandbox/globals.js';
+import { ISandboxGlobals, ipcRenderer, webFrame } from '../../../base/parts/sandbox/electron-browser/globals.js';
 import { zoomLevelToZoomFactor } from '../common/window.js';
 
 export enum ApplyZoomTarget {

src/vs/platform/windows/electron-main/windowImpl.ts

@@ -619,7 +619,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 			this.logService.trace('window#ctor: using window state', state);
 
 			const options = instantiationService.invokeFunction(defaultBrowserWindowOptions, this.windowState, undefined, {
-				preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-sandbox/preload.js').fsPath,
+				preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-browser/preload.js').fsPath,
 				additionalArguments: [`--vscode-window-config=${this.configObjectUrl.resource.toString()}`],
 				v8CacheOptions: this.environmentMainService.useCodeCache ? 'bypassHeatCheck' : 'none',
 			});
@@ -1091,7 +1091,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 		this.readyState = ReadyState.NAVIGATING;
 
 		// Load URL
-		this._win.loadURL(FileAccess.asBrowserUri(`vs/code/electron-sandbox/workbench/workbench${this.environmentMainService.isBuilt ? '' : '-dev'}.html`).toString(true));
+		this._win.loadURL(FileAccess.asBrowserUri(`vs/code/electron-browser/workbench/workbench${this.environmentMainService.isBuilt ? '' : '-dev'}.html`).toString(true));
 
 		// Remember that we did load
 		const wasLoaded = this.wasLoaded;

src/vs/workbench/contrib/chat/test/electron-browser/voiceChatActions.test.ts

@@ -5,7 +5,7 @@
 
 import assert from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { parseNextChatResponseChunk } from '../../electron-sandbox/actions/voiceChatActions.js';
+import { parseNextChatResponseChunk } from '../../electron-browser/actions/voiceChatActions.js';
 
 suite('VoiceChatActions', function () {
 

src/vs/workbench/contrib/codeEditor/electron-browser/startDebugTextMate.ts

@@ -16,7 +16,7 @@ import { ICodeEditorService } from '../../../../editor/browser/services/codeEdit
 import { ITextModel } from '../../../../editor/common/model.js';
 import { Constants } from '../../../../base/common/uint.js';
 import { IHostService } from '../../../services/host/browser/host.js';
-import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js';
 import { ILoggerService } from '../../../../platform/log/common/log.js';
 import { joinPath } from '../../../../base/common/resources.js';
 import { IFileService } from '../../../../platform/files/common/files.js';

src/vs/workbench/contrib/debug/electron-browser/extensionHostDebugService.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IExtensionHostDebugService } from '../../../../platform/debug/common/extensionHostDebug.js';
-import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js';
+import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-browser/services.js';
 import { ExtensionHostDebugChannelClient, ExtensionHostDebugBroadcastChannel } from '../../../../platform/debug/common/extensionHostDebugIpc.js';
 
 registerMainProcessRemoteService(IExtensionHostDebugService, ExtensionHostDebugBroadcastChannel.ChannelName, { channelClientCtor: ExtensionHostDebugChannelClient });

src/vs/workbench/contrib/extensions/electron-browser/extensionProfileService.ts

@@ -21,7 +21,7 @@ import { IExtensionHostProfileService, ProfileSessionState } from './runtimeExte
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { ExtensionHostKind } from '../../../services/extensions/common/extensionHostKind.js';
 import { IExtensionHostProfile, IExtensionService, ProfileSession } from '../../../services/extensions/common/extensions.js';
-import { ExtensionHostProfiler } from '../../../services/extensions/electron-sandbox/extensionHostProfiler.js';
+import { ExtensionHostProfiler } from '../../../services/extensions/electron-browser/extensionHostProfiler.js';
 import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
 import { URI } from '../../../../base/common/uri.js';
 

src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts

@@ -11,7 +11,7 @@ import { ExtensionRecommendationNotificationServiceChannel } from '../../../../p
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { ISharedProcessService } from '../../../../platform/ipc/electron-sandbox/services.js';
+import { ISharedProcessService } from '../../../../platform/ipc/electron-browser/services.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
 import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';

src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts

@@ -6,7 +6,7 @@
 import { localize2 } from '../../../../nls.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { URI } from '../../../../base/common/uri.js';
-import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js';
 import { INativeHostService } from '../../../../platform/native/common/native.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { Action2 } from '../../../../platform/actions/common/actions.js';

src/vs/workbench/contrib/extensions/electron-browser/extensionsAutoProfiler.ts

@@ -20,17 +20,17 @@ import { IFileService } from '../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { INotificationService, NotificationPriority, Severity } from '../../../../platform/notification/common/notification.js';
-import { IProfileAnalysisWorkerService } from '../../../../platform/profiling/electron-sandbox/profileAnalysisWorkerService.js';
+import { IProfileAnalysisWorkerService } from '../../../../platform/profiling/electron-browser/profileAnalysisWorkerService.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { RuntimeExtensionsInput } from '../common/runtimeExtensionsInput.js';
 import { createSlowExtensionAction } from './extensionsSlowActions.js';
 import { IExtensionHostProfileService } from './runtimeExtensionsEditor.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js';
 import { ExtensionHostKind } from '../../../services/extensions/common/extensionHostKind.js';
 import { IExtensionHostProfile, IExtensionService, IResponsiveStateChangeEvent, ProfileSession } from '../../../services/extensions/common/extensions.js';
-import { ExtensionHostProfiler } from '../../../services/extensions/electron-sandbox/extensionHostProfiler.js';
+import { ExtensionHostProfiler } from '../../../services/extensions/electron-browser/extensionHostProfiler.js';
 import { ITimerService } from '../../../services/timer/browser/timerService.js';
 
 export class ExtensionsAutoProfiler implements IWorkbenchContribution {

src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts

@@ -16,7 +16,7 @@ import { joinPath } from '../../../../base/common/resources.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { INativeHostService } from '../../../../platform/native/common/native.js';
-import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js';
 import { Utils } from '../../../../platform/profiling/common/profiling.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { VSBuffer } from '../../../../base/common/buffer.js';

src/vs/workbench/contrib/extensions/test/electron-browser/extensionRecommendationsService.test.ts

@@ -18,7 +18,7 @@ import { NullTelemetryService } from '../../../../../platform/telemetry/common/t
 import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
 import { TestLifecycleService } from '../../../../test/browser/workbenchTestServices.js';
 import { TestContextService, TestProductService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
-import { TestExtensionTipsService, TestSharedProcessService } from '../../../../test/electron-sandbox/workbenchTestServices.js';
+import { TestExtensionTipsService, TestSharedProcessService } from '../../../../test/electron-browser/workbenchTestServices.js';
 import { TestNotificationService } from '../../../../../platform/notification/test/common/testNotificationService.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { URI } from '../../../../../base/common/uri.js';
@@ -37,7 +37,7 @@ import { INotificationService, Severity, IPromptChoice, IPromptOptions } from '.
 import { NativeURLService } from '../../../../../platform/url/common/urlService.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
 import { ExtensionType } from '../../../../../platform/extensions/common/extensions.js';
-import { ISharedProcessService } from '../../../../../platform/ipc/electron-sandbox/services.js';
+import { ISharedProcessService } from '../../../../../platform/ipc/electron-browser/services.js';
 import { FileService } from '../../../../../platform/files/common/fileService.js';
 import { NullLogService, ILogService } from '../../../../../platform/log/common/log.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';

src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts

@@ -26,16 +26,16 @@ import { NullTelemetryService } from '../../../../../platform/telemetry/common/t
 import { IExtensionService, toExtensionDescription } from '../../../../services/extensions/common/extensions.js';
 import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
 import { TestContextService, TestWorkspaceTrustManagementService } from '../../../../test/common/workbenchTestServices.js';
-import { TestExtensionTipsService, TestSharedProcessService } from '../../../../test/electron-sandbox/workbenchTestServices.js';
+import { TestExtensionTipsService, TestSharedProcessService } from '../../../../test/electron-browser/workbenchTestServices.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
 import { NativeURLService } from '../../../../../platform/url/common/urlService.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
 import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.js';
-import { RemoteAgentService } from '../../../../services/remote/electron-sandbox/remoteAgentService.js';
+import { RemoteAgentService } from '../../../../services/remote/electron-browser/remoteAgentService.js';
 import { IExtensionContributions, ExtensionType, IExtensionDescription, IExtension } from '../../../../../platform/extensions/common/extensions.js';
-import { ISharedProcessService } from '../../../../../platform/ipc/electron-sandbox/services.js';
+import { ISharedProcessService } from '../../../../../platform/ipc/electron-browser/services.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { ILabelService, IFormatterChangeEvent } from '../../../../../platform/label/common/label.js';
 import { IProductService } from '../../../../../platform/product/common/productService.js';
@@ -45,7 +45,7 @@ import { ProgressService } from '../../../../services/progress/browser/progressS
 import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
 import { TestEnvironmentService, TestLifecycleService } from '../../../../test/browser/workbenchTestServices.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
-import { INativeWorkbenchEnvironmentService } from '../../../../services/environment/electron-sandbox/environmentService.js';
+import { INativeWorkbenchEnvironmentService } from '../../../../services/environment/electron-browser/environmentService.js';
 import { IWorkbenchEnvironmentService } from '../../../../services/environment/common/environmentService.js';
 import { IUserDataSyncEnablementService } from '../../../../../platform/userDataSync/common/userDataSync.js';
 import { UserDataSyncEnablementService } from '../../../../../platform/userDataSync/common/userDataSyncEnablementService.js';

src/vs/workbench/contrib/extensions/test/electron-browser/extensionsViews.test.ts

@@ -26,7 +26,7 @@ import { NullTelemetryService } from '../../../../../platform/telemetry/common/t
 import { IExtensionService, toExtensionDescription } from '../../../../services/extensions/common/extensions.js';
 import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
 import { TestMenuService } from '../../../../test/browser/workbenchTestServices.js';
-import { TestSharedProcessService } from '../../../../test/electron-sandbox/workbenchTestServices.js';
+import { TestSharedProcessService } from '../../../../test/electron-browser/workbenchTestServices.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
 import { NativeURLService } from '../../../../../platform/url/common/urlService.js';
@@ -34,9 +34,9 @@ import { URI } from '../../../../../base/common/uri.js';
 import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
 import { SinonStub } from 'sinon';
 import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.js';
-import { RemoteAgentService } from '../../../../services/remote/electron-sandbox/remoteAgentService.js';
+import { RemoteAgentService } from '../../../../services/remote/electron-browser/remoteAgentService.js';
 import { ExtensionType, IExtension } from '../../../../../platform/extensions/common/extensions.js';
-import { ISharedProcessService } from '../../../../../platform/ipc/electron-sandbox/services.js';
+import { ISharedProcessService } from '../../../../../platform/ipc/electron-browser/services.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
 import { IMenuService } from '../../../../../platform/actions/common/actions.js';

src/vs/workbench/contrib/extensions/test/electron-browser/extensionsWorkbenchService.test.ts

@@ -24,7 +24,7 @@ import { IPager } from '../../../../../base/common/paging.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
 import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
 import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
-import { TestExtensionTipsService, TestSharedProcessService } from '../../../../test/electron-sandbox/workbenchTestServices.js';
+import { TestExtensionTipsService, TestSharedProcessService } from '../../../../test/electron-browser/workbenchTestServices.js';
 import { ConfigurationTarget, IConfigurationChangeEvent, IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
 import { IProgressService } from '../../../../../platform/progress/common/progress.js';
@@ -36,8 +36,8 @@ import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { ExtensionType } from '../../../../../platform/extensions/common/extensions.js';
 import { ExtensionKind } from '../../../../../platform/environment/common/environment.js';
 import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.js';
-import { RemoteAgentService } from '../../../../services/remote/electron-sandbox/remoteAgentService.js';
-import { ISharedProcessService } from '../../../../../platform/ipc/electron-sandbox/services.js';
+import { RemoteAgentService } from '../../../../services/remote/electron-browser/remoteAgentService.js';
+import { ISharedProcessService } from '../../../../../platform/ipc/electron-browser/services.js';
 import { TestContextService } from '../../../../test/common/workbenchTestServices.js';
 import { IProductService } from '../../../../../platform/product/common/productService.js';
 import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';

src/vs/workbench/contrib/externalTerminal/electron-browser/externalTerminal.contribution.ts

@@ -14,7 +14,7 @@ import { Schemas } from '../../../../base/common/network.js';
 import { IConfigurationRegistry, Extensions, ConfigurationScope, type IConfigurationPropertySchema } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js';
-import { IExternalTerminalService } from '../../../../platform/externalTerminal/electron-sandbox/externalTerminalService.js';
+import { IExternalTerminalService } from '../../../../platform/externalTerminal/electron-browser/externalTerminalService.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { TerminalContextKeys } from '../../terminal/common/terminalContextKey.js';
 import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.js';

src/vs/workbench/contrib/inlineChat/electron-browser/inlineChatActions.ts

@@ -13,7 +13,7 @@ import { disposableTimeout } from '../../../../base/common/async.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { StartVoiceChatAction, StopListeningAction, VOICE_KEY_HOLD_THRESHOLD } from '../../chat/electron-sandbox/actions/voiceChatActions.js';
+import { StartVoiceChatAction, StopListeningAction, VOICE_KEY_HOLD_THRESHOLD } from '../../chat/electron-browser/actions/voiceChatActions.js';
 import { IChatExecuteActionContext } from '../../chat/browser/actions/chatExecuteActions.js';
 import { CTX_INLINE_CHAT_VISIBLE, InlineChatConfigKeys } from '../common/inlineChat.js';
 import { HasSpeechProvider, ISpeechService } from '../../speech/common/speechService.js';

src/vs/workbench/contrib/issue/electron-browser/issueReporterService.ts

@@ -17,7 +17,7 @@ import { INativeHostService } from '../../../../platform/native/common/native.js
 import { IProcessService } from '../../../../platform/process/common/process.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { IUpdateService, StateType } from '../../../../platform/update/common/update.js';
-import { applyZoom } from '../../../../platform/window/electron-sandbox/window.js';
+import { applyZoom } from '../../../../platform/window/electron-browser/window.js';
 import { BaseIssueReporterService } from '../browser/baseIssueReporterService.js';
 import { IssueReporterData as IssueReporterModelData } from '../browser/issueReporterModel.js';
 import { IIssueFormService, IssueReporterData, IssueType } from '../common/issue.js';

src/vs/workbench/contrib/localization/electron-browser/localization.contribution.ts

@@ -139,7 +139,7 @@ class NativeLocalizationWorkbenchContribution extends BaseLocalizationWorkbenchC
 		const loc = manifest?.contributes?.localizations?.find(x => locale.startsWith(x.languageId.toLowerCase()));
 		const languageName = loc ? (loc.languageName || locale) : locale;
 		const languageDisplayName = loc ? (loc.localizedLanguageName || loc.languageName || locale) : locale;
-		const translationsFromPack: { [key: string]: string } = translation?.contents?.['vs/workbench/contrib/localization/electron-sandbox/minimalTranslations'] ?? {};
+		const translationsFromPack: { [key: string]: string } = translation?.contents?.['vs/workbench/contrib/localization/electron-browser/minimalTranslations'] ?? {};
 		const promptMessageKey = extensionToInstall ? 'installAndRestartMessage' : 'showLanguagePackExtensions';
 		const useEnglish = !translationsFromPack[promptMessageKey];
 

src/vs/workbench/contrib/logs/electron-browser/logsActions.ts

@@ -6,7 +6,7 @@
 import { Action } from '../../../../base/common/actions.js';
 import * as nls from '../../../../nls.js';
 import { INativeHostService } from '../../../../platform/native/common/native.js';
-import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js';
+import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { joinPath } from '../../../../base/common/resources.js';
 import { Schemas } from '../../../../base/common/network.js';