File tree Expand file tree Collapse file tree 1 file changed +1
-9
lines changed
lib/vscode/src/vs/workbench/services/localizations/electron-sandbox Expand file tree Collapse file tree 1 file changed +1
-9
lines changed Original file line number Diff line number Diff line change 55
66import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc' ;
77import { ILocalizationsService } from 'vs/platform/localizations/common/localizations' ;
8- < < < << << HEAD :lib / v s c o d e / src/ vs / workbench / services / localizations / electron - browser / localizationsService . ts
9- === = ===
108import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services' ;
11- > >>> >>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384:lib / vscode / src / vs / workbench / services / localizations / electron - sandbox / localizationsService . ts
129import { registerSingleton } from 'vs/platform/instantiation/common/extensions' ;
13- import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService' ;
1410
1511// @ts -ignore: interface is implemented via proxy
1612export class LocalizationsService implements ILocalizationsService {
1713
1814 declare readonly _serviceBrand : undefined ;
1915
2016 constructor (
21- @IRemoteAgentService remoteAgentService : IRemoteAgentService ,
17+ @ISharedProcessService sharedProcessService : ISharedProcessService ,
2218 ) {
23- < < < << << HEAD :lib / v s c o d e / src/ vs / workbench / services / localizations / electron - browser / localizationsService . ts
24- return createChannelSender < ILocalizationsService > ( remoteAgentService . getConnection ( ) ! . getChannel ( 'localizations' ) ) ;
25- = === ===
2619 return ProxyChannel . toService < ILocalizationsService > ( sharedProcessService . getChannel ( 'localizations' ) ) ;
27- > >>> >>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384:lib / vscode / src / vs / workbench / services / localizations / electron - sandbox / localizationsService . ts
2820 }
2921}
3022
You can’t perform that action at this time.
0 commit comments