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 5
5
6
6
import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc' ;
7
7
import { 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
- === = ===
10
8
import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services' ;
11
- > >>> >>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384:lib / vscode / src / vs / workbench / services / localizations / electron - sandbox / localizationsService . ts
12
9
import { registerSingleton } from 'vs/platform/instantiation/common/extensions' ;
13
- import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService' ;
14
10
15
11
// @ts -ignore: interface is implemented via proxy
16
12
export class LocalizationsService implements ILocalizationsService {
17
13
18
14
declare readonly _serviceBrand : undefined ;
19
15
20
16
constructor (
21
- @IRemoteAgentService remoteAgentService : IRemoteAgentService ,
17
+ @ISharedProcessService sharedProcessService : ISharedProcessService ,
22
18
) {
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
- = === ===
26
19
return ProxyChannel . toService < ILocalizationsService > ( sharedProcessService . getChannel ( 'localizations' ) ) ;
27
- > >>> >>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384:lib / vscode / src / vs / workbench / services / localizations / electron - sandbox / localizationsService . ts
28
20
}
29
21
}
30
22
You can’t perform that action at this time.
0 commit comments