Move keybinding editing service to platform

src/vs/platform/keybinding/common/keybinding.ts

@@ -10,6 +10,7 @@ import { IContextKeyServiceTarget } from 'vs/platform/contextkey/common/contextk
 import { IResolveResult } from 'vs/platform/keybinding/common/keybindingResolver';
 import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
 import { Event } from 'vs/base/common/event';
+import { TPromise } from 'vs/base/common/winjs.base';
 
 export interface IUserFriendlyKeybinding {
 	key: string;
@@ -79,3 +80,15 @@ export interface IKeybindingService {
 	customKeybindingsCount(): number;
 }
 
+export const IKeybindingEditingService = createDecorator<IKeybindingEditingService>('keybindingEditingService');
+
+export interface IKeybindingEditingService {
+
+	_serviceBrand: any;
+
+	editKeybinding(key: string, keybindingItem: ResolvedKeybindingItem): TPromise<void>;
+
+	removeKeybinding(keybindingItem: ResolvedKeybindingItem): TPromise<void>;
+
+	resetKeybinding(keybindingItem: ResolvedKeybindingItem): TPromise<void>;
+}

src/vs/workbench/electron-browser/workbench.ts

@@ -48,8 +48,8 @@ import { WorkspaceService, DefaultConfigurationExportHelper } from 'vs/workbench
 import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
 import { JSONEditingService } from 'vs/workbench/services/configuration/node/jsonEditingService';
 import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IKeybindingEditingService, KeybindingsEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing';
+import { IKeybindingService, IKeybindingEditingService } from 'vs/platform/keybinding/common/keybinding';
+import { KeybindingsEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing';
 import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IActivityService } from 'vs/workbench/services/activity/common/activity';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';

src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts

@@ -21,7 +21,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { KeybindingsEditorModel, IKeybindingItemEntry, IListEntry, KEYBINDING_ENTRY_TEMPLATE_ID, KEYBINDING_HEADER_TEMPLATE_ID } from 'vs/workbench/services/preferences/common/keybindingsEditorModel';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IKeybindingService, IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding';
+import { IKeybindingService, IUserFriendlyKeybinding, IKeybindingEditingService } from 'vs/platform/keybinding/common/keybinding';
 import { SearchWidget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
 import { DefineKeybindingWidget } from 'vs/workbench/parts/preferences/browser/keybindingWidgets';
 import {
@@ -30,7 +30,6 @@ import {
 	KEYBINDINGS_EDITOR_SHOW_USER_KEYBINDINGS
 } from 'vs/workbench/parts/preferences/common/preferences';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IKeybindingEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing';
 import { List } from 'vs/base/browser/ui/list/listWidget';
 import { IDelegate, IRenderer, IListContextMenuEvent, IListEvent } from 'vs/base/browser/ui/list/list';
 import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';

src/vs/workbench/services/keybinding/common/keybindingEditing.ts

@@ -17,29 +17,14 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
-import { IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding';
+import { IUserFriendlyKeybinding, IKeybindingEditingService } from 'vs/platform/keybinding/common/keybinding';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ITextModelService, ITextEditorModel } from 'vs/editor/common/services/resolverService';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { IFileService } from 'vs/platform/files/common/files';
-import { createDecorator, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
 import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
 import { ITextModel } from 'vs/editor/common/model';
 
-
-export const IKeybindingEditingService = createDecorator<IKeybindingEditingService>('keybindingEditingService');
-
-export interface IKeybindingEditingService {
-
-	_serviceBrand: ServiceIdentifier<any>;
-
-	editKeybinding(key: string, keybindingItem: ResolvedKeybindingItem): TPromise<void>;
-
-	removeKeybinding(keybindingItem: ResolvedKeybindingItem): TPromise<void>;
-
-	resetKeybinding(keybindingItem: ResolvedKeybindingItem): TPromise<void>;
-}
-
 export class KeybindingsEditingService extends Disposable implements IKeybindingEditingService {
 
 	public _serviceBrand: any;