From ffd210a7a5e979393c19acd243c2ffff074c8257 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 17 Aug 2016 14:55:53 +0200
Subject: [PATCH] more cleanup

---
 src/vs/code/electron-main/window.ts           | 4 ----
 src/vs/code/electron-main/windows.ts          | 8 +++-----
 src/vs/platform/workspace/common/workspace.ts | 5 -----
 src/vs/workbench/electron-browser/shell.ts    | 2 +-
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
index 6f426bf0e85..289c61b7d88 100644
--- a/src/vs/code/electron-main/window.ts
+++ b/src/vs/code/electron-main/window.ts
@@ -90,10 +90,6 @@ export interface IPath {
 
 export interface IWindowConfiguration extends ICommandLineArguments {
 
-	// TODO@Ben things to still clean up
-	appSettingsHome: string;
-	userExtensionsHome: string;
-
 	// Used to configure the workbench when opening
 	workspacePath?: string;
 	recentFiles: string[];
diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
index 0b9be2e79f9..9b93d07b21b 100644
--- a/src/vs/code/electron-main/windows.ts
+++ b/src/vs/code/electron-main/windows.ts
@@ -726,16 +726,14 @@ export class WindowsManager implements IWindowsService {
 
 	private toConfiguration(userEnv: IProcessEnvironment, cli: ICommandLineArguments, workspacePath?: string, filesToOpen?: IPath[], filesToCreate?: IPath[], filesToDiff?: IPath[], extensionsToInstall?: string[]): IWindowConfiguration {
 		let configuration: IWindowConfiguration = mixin({}, cli); // inherit all properties from CLI
+		configuration.appRoot = this.envService.appRoot;
+		configuration.execPath = process.execPath;
+		configuration.userEnv = userEnv;
 		configuration.workspacePath = workspacePath;
 		configuration.filesToOpen = filesToOpen;
 		configuration.filesToCreate = filesToCreate;
 		configuration.filesToDiff = filesToDiff;
 		configuration.extensionsToInstall = extensionsToInstall;
-		configuration.appRoot = this.envService.appRoot;
-		configuration.execPath = process.execPath;
-		configuration.appSettingsHome = this.envService.appSettingsHome;
-		configuration.userExtensionsHome = this.envService.userExtensionsHome;
-		configuration.userEnv = userEnv;
 
 		const recents = this.getRecentlyOpenedPaths(workspacePath, filesToOpen);
 		configuration.recentFiles = recents.files;
diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts
index ff524ab9ded..71654091cfc 100644
--- a/src/vs/platform/workspace/common/workspace.ts
+++ b/src/vs/platform/workspace/common/workspace.ts
@@ -87,11 +87,6 @@ export interface IConfiguration {
 export interface IEnvironment {
 	appRoot: string;
 
-	appSettingsHome: string;
-
-	disableExtensions: boolean;
-
-	userExtensionsHome: string;
 	extensionDevelopmentPath: string;
 	extensionTestsPath: string;
 
diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts
index 2d5c07ee71a..1289b8d2761 100644
--- a/src/vs/workbench/electron-browser/shell.ts
+++ b/src/vs/workbench/electron-browser/shell.ts
@@ -252,7 +252,7 @@ export class WorkbenchShell {
 			const config: ITelemetryServiceConfig = {
 				appender: new TelemetryAppenderClient(channel),
 				commonProperties: resolveWorkbenchCommonProperties(this.storageService, commit, version),
-				piiPaths: [this.environmentService.appRoot, this.configuration.env.userExtensionsHome]
+				piiPaths: [this.environmentService.appRoot, this.environmentService.extensionsPath]
 			};
 
 			const telemetryService = instantiationService.createInstance(TelemetryService, config);