sandbox - move more things into electron-sandbox

src/vs/workbench/contrib/backup/electron-browser/backup.contribution.ts → src/vs/workbench/contrib/backup/electron-sandbox/backup.contribution.ts

@@ -6,7 +6,7 @@
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-import { NativeBackupTracker } from 'vs/workbench/contrib/backup/electron-browser/backupTracker';
+import { NativeBackupTracker } from 'vs/workbench/contrib/backup/electron-sandbox/backupTracker';
 
 // Register Backup Tracker
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(NativeBackupTracker, LifecyclePhase.Starting);

src/vs/workbench/contrib/backup/test/electron-browser/backupRestorer.test.ts

@@ -13,7 +13,7 @@ import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
 import { getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { DefaultEndOfLine } from 'vs/editor/common/model';
 import { hashPath } from 'vs/workbench/services/backup/node/backupFileService';
-import { NativeBackupTracker } from 'vs/workbench/contrib/backup/electron-browser/backupTracker';
+import { NativeBackupTracker } from 'vs/workbench/contrib/backup/electron-sandbox/backupTracker';
 import { workbenchInstantiationService } from 'vs/workbench/test/electron-browser/workbenchTestServices';
 import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';

src/vs/workbench/contrib/backup/test/electron-browser/backupTracker.test.ts

@@ -11,7 +11,7 @@ import * as pfs from 'vs/base/node/pfs';
 import { URI } from 'vs/base/common/uri';
 import { getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { hashPath } from 'vs/workbench/services/backup/node/backupFileService';
-import { NativeBackupTracker } from 'vs/workbench/contrib/backup/electron-browser/backupTracker';
+import { NativeBackupTracker } from 'vs/workbench/contrib/backup/electron-sandbox/backupTracker';
 import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';

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

@@ -3,6 +3,4 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import './inputClipboardActions';
-import './selectionClipboard';
 import './startDebugTextMate';

src/vs/workbench/contrib/codeEditor/electron-sandbox/codeEditor.contribution.ts

@@ -3,4 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import './inputClipboardActions';
+import './selectionClipboard';
 import './sleepResumeRepaintMinimap';

src/vs/workbench/contrib/files/electron-browser/fileActions.contribution.ts → src/vs/workbench/contrib/files/electron-sandbox/fileActions.contribution.ts

@@ -17,7 +17,7 @@ import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation
 import { getMultiSelectedResources } from 'vs/workbench/contrib/files/browser/files';
 import { IListService } from 'vs/platform/list/browser/listService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { revealResourcesInOS } from 'vs/workbench/contrib/files/electron-browser/fileCommands';
+import { revealResourcesInOS } from 'vs/workbench/contrib/files/electron-sandbox/fileCommands';
 import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { ResourceContextKey } from 'vs/workbench/common/resources';
 import { appendToCommandPalette, appendEditorTitleContextMenuItem } from 'vs/workbench/contrib/files/browser/fileActions.contribution';

src/vs/workbench/electron-browser/desktop.contribution.ts

@@ -12,7 +12,7 @@ import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/action
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform';
 import { ToggleSharedProcessAction, ToggleDevToolsAction, ConfigureRuntimeArgumentsAction } from 'vs/workbench/electron-browser/actions/developerActions';
-import { ZoomResetAction, ZoomOutAction, ZoomInAction, CloseCurrentWindowAction, SwitchWindow, QuickSwitchWindow, ReloadWindowWithExtensionsDisabledAction, NewWindowTabHandler, ShowPreviousWindowTabHandler, ShowNextWindowTabHandler, MoveWindowTabToNewWindowHandler, MergeWindowTabsHandlerHandler, ToggleWindowTabsBarHandler } from 'vs/workbench/electron-browser/actions/windowActions';
+import { ZoomResetAction, ZoomOutAction, ZoomInAction, CloseCurrentWindowAction, SwitchWindow, QuickSwitchWindow, ReloadWindowWithExtensionsDisabledAction, NewWindowTabHandler, ShowPreviousWindowTabHandler, ShowNextWindowTabHandler, MoveWindowTabToNewWindowHandler, MergeWindowTabsHandlerHandler, ToggleWindowTabsBarHandler } from 'vs/workbench/electron-sandbox/actions/windowActions';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';

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

@@ -24,6 +24,8 @@ import { IElectronService } from 'vs/platform/electron/common/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;
@@ -241,3 +243,5 @@ export class TitlebarPart extends BrowserTitleBarPart {
 		}
 	}
 }
+
+registerSingleton(ITitleService, TitlebarPart);

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

@@ -65,13 +65,10 @@ import 'vs/workbench/services/path/electron-browser/pathService';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { ICredentialsService } from 'vs/platform/credentials/common/credentials';
 import { KeytarCredentialsService } from 'vs/platform/credentials/node/credentialsService';
-import { TitlebarPart } from 'vs/workbench/electron-browser/parts/titlebar/titlebarPart';
-import { ITitleService } from 'vs/workbench/services/title/common/titleService';
 import { IUserDataAutoSyncService } from 'vs/platform/userDataSync/common/userDataSync';
 import { UserDataAutoSyncService } from 'vs/workbench/contrib/userDataSync/electron-browser/userDataAutoSyncService';
 
 registerSingleton(ICredentialsService, KeytarCredentialsService, true);
-registerSingleton(ITitleService, TitlebarPart);
 registerSingleton(IUserDataAutoSyncService, UserDataAutoSyncService);
 
 //#endregion
@@ -94,10 +91,6 @@ import 'vs/workbench/contrib/splash/electron-browser/partsSplash.contribution';
 
 // Explorer
 import 'vs/workbench/contrib/files/electron-browser/files.contribution';
-import 'vs/workbench/contrib/files/electron-browser/fileActions.contribution';
-
-// Backup
-import 'vs/workbench/contrib/backup/electron-browser/backup.contribution';
 
 // Debug
 import 'vs/workbench/contrib/debug/node/debugHelperService';

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

@@ -20,12 +20,19 @@ 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';
 
 //#endregion
 
 
 //#region --- workbench contributions
 
+// Explorer
+import 'vs/workbench/contrib/files/electron-sandbox/fileActions.contribution';
+
+// Backup
+import 'vs/workbench/contrib/backup/electron-sandbox/backup.contribution';
+
 // CodeEditor Contributions
 import 'vs/workbench/contrib/codeEditor/electron-sandbox/codeEditor.contribution';