gallery service: do not depend on context service

joaomoreno · joaomoreno · commit ea7600eca85d · 2016-05-02T16:05:37.000+02:00
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts b/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
@@ -9,7 +9,7 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IStatusbarRegistry, Extensions as StatusbarExtensions, StatusbarItemDescriptor, StatusbarAlignment } from 'vs/workbench/browser/parts/statusbar/statusbar';
 import { ExtensionsStatusbarItem } from 'vs/workbench/parts/extensions/electron-browser/extensionsWidgets';
 import { IGalleryService, IExtensionTipsService, ExtensionsLabel, ExtensionsChannelId } from 'vs/workbench/parts/extensions/common/extensions';
-import { GalleryService } from 'vs/workbench/parts/extensions/common/vsoGalleryService';
+import { GalleryService } from 'vs/workbench/parts/extensions/node/vsoGalleryService';
 import { ExtensionTipsService } from 'vs/workbench/parts/extensions/electron-browser/extensionTipsService';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { ExtensionsWorkbenchExtension } from 'vs/workbench/parts/extensions/electron-browser/extensionsWorkbenchExtension';
diff --git a/src/vs/workbench/parts/extensions/node/vsoGalleryService.ts b/src/vs/workbench/parts/extensions/node/vsoGalleryService.ts
@@ -9,10 +9,10 @@ import { isUndefined } from 'vs/base/common/types';
 import { IXHRResponse } from 'vs/base/common/http';
 import { assign, getOrDefault } from 'vs/base/common/objects';
 import { IRequestService } from 'vs/platform/request/common/request';
-import { IWorkspaceContextService } from 'vs/workbench/services/workspace/common/contextService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { matchesContiguousSubString } from 'vs/base/common/filters';
-import { getExtensionId } from './extensionsUtil';
+import { getExtensionId } from 'vs/workbench/parts/extensions/common/extensionsUtil';
+import product from 'vs/platform/node/product';
 
 export interface IGalleryExtensionFile {
 	assetType: string;
@@ -211,10 +211,9 @@ export class GalleryService implements IGalleryService {
 
 	constructor(
 		@IRequestService private requestService: IRequestService,
-		@IWorkspaceContextService contextService: IWorkspaceContextService,
 		@ITelemetryService private telemetryService: ITelemetryService
 	) {
-		const config = contextService.getConfiguration().env.extensionsGallery;
+		const config = product.extensionsGallery;
 		this.extensionsGalleryUrl = config && config.serviceUrl;
 		this.extensionsCacheUrl = config && config.cacheUrl;
 		this.machineId = telemetryService.getTelemetryInfo().then(({ machineId }) => machineId);
