sandbox - move more services to electron-sandbox

src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts

@@ -24,8 +24,6 @@ import { IElectronService } from 'vs/platform/electron/electron-sandbox/electron
 import { getTitleBarStyle } from 'vs/platform/windows/common/windows';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Codicon } from 'vs/base/common/codicons';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { ITitleService } from 'vs/workbench/services/title/common/titleService';
 
 export class TitlebarPart extends BrowserTitleBarPart {
 	private appIcon: HTMLElement | undefined;
@@ -243,5 +241,3 @@ export class TitlebarPart extends BrowserTitleBarPart {
 		}
 	}
 }
-
-registerSingleton(ITitleService, TitlebarPart);

src/vs/workbench/services/host/electron-browser/desktopHostService.ts → src/vs/workbench/services/host/electron-sandbox/desktopHostService.ts

@@ -11,7 +11,6 @@ import { ILabelService } from 'vs/platform/label/common/label';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IWindowOpenable, IOpenWindowOptions, isFolderToOpen, isWorkspaceToOpen, IOpenEmptyWindowOptions } from 'vs/platform/windows/common/windows';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-browser/environmentService';
 
 export class DesktopHostService extends Disposable implements IHostService {
 
@@ -20,7 +19,7 @@ export class DesktopHostService extends Disposable implements IHostService {
 	constructor(
 		@IElectronService private readonly electronService: IElectronService,
 		@ILabelService private readonly labelService: ILabelService,
-		@IWorkbenchEnvironmentService private readonly environmentService: INativeWorkbenchEnvironmentService
+		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService
 	) {
 		super();
 	}

src/vs/workbench/services/themes/test/electron-browser/tokenStyleResolving.test.ts

@@ -15,7 +15,7 @@ import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemPro
 import { Schemas } from 'vs/base/common/network';
 import { URI } from 'vs/base/common/uri';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
-import { ExtensionResourceLoaderService } from 'vs/workbench/services/extensionResourceLoader/electron-browser/extensionResourceLoaderService';
+import { ExtensionResourceLoaderService } from 'vs/workbench/services/extensionResourceLoader/electron-sandbox/extensionResourceLoaderService';
 import { ITokenStyle } from 'vs/platform/theme/common/themeService';
 
 const undefinedStyle = { bold: undefined, underline: undefined, italic: undefined };

src/vs/workbench/services/title/electron-sandbox/titleService.ts

+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { TitlebarPart } from 'vs/workbench/browser/parts/titlebar/titlebarPart';
+import { ITitleService } from 'vs/workbench/services/title/common/titleService';
+
+registerSingleton(ITitleService, TitlebarPart);

src/vs/workbench/workbench.desktop.main.ts

@@ -59,12 +59,9 @@ import 'vs/workbench/services/userDataSync/electron-browser/userDataSyncMachines
 import 'vs/workbench/services/userDataSync/electron-browser/userDataSyncService';
 import 'vs/workbench/services/authentication/electron-browser/authenticationTokenService';
 import 'vs/workbench/services/authentication/browser/authenticationService';
-import 'vs/workbench/services/host/electron-browser/desktopHostService';
-import 'vs/workbench/services/request/electron-browser/requestService';
 import 'vs/workbench/services/sharedProcess/electron-browser/sharedProcessService';
 import 'vs/workbench/services/localizations/electron-browser/localizationsService';
 import 'vs/workbench/services/clipboard/electron-browser/clipboardService';
-import 'vs/workbench/services/extensionResourceLoader/electron-browser/extensionResourceLoaderService';
 import 'vs/workbench/services/path/electron-browser/pathService';
 
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';

src/vs/workbench/workbench.sandbox.main.ts

@@ -26,7 +26,10 @@ import 'vs/workbench/services/issue/electron-sandbox/issueService';
 import 'vs/workbench/services/update/electron-sandbox/updateService';
 import 'vs/workbench/services/url/electron-sandbox/urlService';
 import 'vs/workbench/services/lifecycle/electron-sandbox/lifecycleService';
-import 'vs/workbench/electron-sandbox/parts/titlebar/titlebarPart';
+import 'vs/workbench/services/title/electron-sandbox/titleService.ts';
+import 'vs/workbench/services/host/electron-sandbox/desktopHostService';
+import 'vs/workbench/services/request/electron-sandbox/requestService';
+import 'vs/workbench/services/extensionResourceLoader/electron-sandbox/extensionResourceLoaderService';
 
 //#endregion