Merge from vscode 79a1f5a5ca0c6c53db617aa1fa5a2396d2caebe2

src/main.js

@@ -42,6 +42,9 @@ app.setPath('userData', userDataPath);
 // Set temp directory based on crash-reporter-directory CLI argument
 // The crash reporter will store crashes in temp folder so we need
 // to change that location accordingly.
+
+// If a crash-reporter-directory is specified we setup the crash reporter
+// right from the beginning as early as possible to monitor all processes.
 let crashReporterDirectory = args['crash-reporter-directory'];
 if (crashReporterDirectory) {
 	crashReporterDirectory = path.normalize(crashReporterDirectory);
@@ -54,8 +57,20 @@ if (crashReporterDirectory) {
 			app.exit(1);
 		}
 	}
+
+	// Crashes are stored in the temp directory by default, so we
+	// need to change that directory to the provided one
 	console.log(`Found --crash-reporter-directory argument. Setting temp directory to be '${crashReporterDirectory}'`);
 	app.setPath('temp', crashReporterDirectory);
+
+	// Start crash reporter
+	const { crashReporter } = require('electron');
+	crashReporter.start({
+		companyName: 'Microsoft',
+		productName: product.nameShort,
+		submitURL: '',
+		uploadToServer: false
+	});
 }
 
 // Set logs path before app 'ready' event if running portable
@@ -71,7 +86,15 @@ setCurrentWorkingDirectory();
 
 // Register custom schemes with privileges
 protocol.registerSchemesAsPrivileged([
-	{ scheme: 'vscode-resource', privileges: { secure: true, supportFetchAPI: true, corsEnabled: true } }
+	{
+		scheme: 'vscode-webview-resource',
+		privileges: {
+			secure: true,
+			standard: true,
+			supportFetchAPI: true,
+			corsEnabled: true,
+		}
+	},
 ]);
 
 // Global app listeners