Merge from vscode 52dcb723a39ae75bee1bd56b3312d7fcdc87aeed (#6719)

This commit is contained in:
Anthony Dresser
2019-08-12 21:31:51 -07:00
committed by GitHub
parent 00250839fc
commit 7eba8c4c03
616 changed files with 9472 additions and 7087 deletions

View File

@@ -180,7 +180,7 @@ export interface IStartupMetrics {
/**
* The time it took to create a new renderer (browser window) and to initialize that to the point
* of load the main-bundle (`workbench.main.js`).
* of load the main-bundle (`workbench.desktop.main.js`).
*
* * Happens in the main-process *and* the renderer-process
* * Measured with the `main:loadWindow` and `willLoadWorkbenchMain` performance marks.
@@ -208,7 +208,7 @@ export interface IStartupMetrics {
readonly ellapsedWorkspaceServiceInit: number;
/**
* The time it took to load the main-bundle of the workbench, e.g. `workbench.main.js`.
* The time it took to load the main-bundle of the workbench, e.g. `workbench.desktop.main.js`.
*
* * Happens in the renderer-process
* * Measured with the `willLoadWorkbenchMain` and `didLoadWorkbenchMain` performance marks.
@@ -305,7 +305,7 @@ class TimerService implements ITimerService {
_serviceBrand: any;
private _startupMetrics: Promise<IStartupMetrics>;
private _startupMetrics?: Promise<IStartupMetrics>;
constructor(
@IWindowsService private readonly _windowsService: IWindowsService,