register things for all

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

@@ -13,8 +13,7 @@ import { Extensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common
 import { Extensions as Input, IEditorInputFactory, IEditorInputFactoryRegistry } from 'vs/workbench/common/editor';
 import { PerfviewContrib, PerfviewInput } from 'vs/workbench/contrib/performance/browser/perfviewEditor';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { StartupProfiler } from './startupProfiler';
-import { StartupTimings } from '../browser/startupTimings';
+import { StartupTimings } from './startupTimings';
 
 // -- startup performance view
 
@@ -48,12 +47,6 @@ MenuRegistry.addCommand({
 });
 
 
-// -- startup profiler
-
-Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench).registerWorkbenchContribution(
-	StartupProfiler,
-	LifecyclePhase.Restored
-);
 
 // -- startup timings
 

src/vs/workbench/contrib/performance/electron-browser/startupProfiler.ts

@@ -12,12 +12,13 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import product from 'vs/platform/product/node/product';
 import { IWindowsService } from 'vs/platform/windows/common/windows';
-import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
+import { Extensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { PerfviewInput } from 'vs/workbench/contrib/performance/browser/perfviewEditor';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { URI } from 'vs/base/common/uri';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { Registry } from 'vs/platform/registry/common/platform';
 
 export class StartupProfiler implements IWorkbenchContribution {
 
@@ -121,3 +122,10 @@ export class StartupProfiler implements IWorkbenchContribution {
 		this._openerService.open(URI.parse(`${baseUrl}${queryStringPrefix}body=${encodeURIComponent(body)}`));
 	}
 }
+
+// -- register as workbench contribution
+
+Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench).registerWorkbenchContribution(
+	StartupProfiler,
+	LifecyclePhase.Restored
+);

src/vs/workbench/workbench.common.main.ts

@@ -237,4 +237,7 @@ import 'vs/workbench/contrib/experiments/browser/experiments.contribution';
 // Send a Smile
 import 'vs/workbench/contrib/feedback/browser/feedback.contribution';
 
+// Performance
+import 'vs/workbench/contrib/performance/browser/performance.contribution';
+
 //#endregion

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

@@ -130,7 +130,7 @@ import 'vs/workbench/contrib/surveys/electron-browser/nps.contribution';
 import 'vs/workbench/contrib/surveys/electron-browser/languageSurveys.contribution';
 
 // Performance
-import 'vs/workbench/contrib/performance/electron-browser/performance.contribution';
+import 'vs/workbench/contrib/performance/electron-browser/startupProfiler';
 
 // CLI
 import 'vs/workbench/contrib/cli/node/cli.contribution';