bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 08:13:42 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/bitwarden/browser into feature/safari-webext

Browse Source 
# Conflicts:
#	src/background/runtime.background.ts
This commit is contained in:
Hinton
2020-12-11 14:33:46 +01:00
parent 35d1d5d723 c95230fc48
commit 25a2af903a
12 changed files with 82 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/background/main.background.ts
View File

@@ -157,7 +157,7 @@ export default class MainBackground {
const promise = this.nativeMessagingBackground.getResponse();
try {
await this.nativeMessagingBackground.send({command: 'biometricUnlock'});
await this.nativeMessagingBackground.send({ command: 'biometricUnlock' });
} catch (e) {
return Promise.reject(e);
}
@@ -243,7 +243,7 @@ export default class MainBackground {
this.runtimeBackground = new RuntimeBackground(this, this.autofillService, this.cipherService,
this.platformUtilsService as BrowserPlatformUtilsService, this.storageService, this.i18nService,
this.analytics, this.notificationsService, this.systemService, this.vaultTimeoutService,
this.environmentService);
this.environmentService, this.policyService, this.userService);
this.nativeMessagingBackground = new NativeMessagingBackground(this.storageService, this.cryptoService, this.cryptoFunctionService,
this.vaultTimeoutService, this.runtimeBackground, this.i18nService, this.userService, this.messagingService);
this.commandsBackground = new CommandsBackground(this, this.passwordGenerationService,
@@ -290,7 +290,7 @@ export default class MainBackground {
}
async setIcon() {
if ((!chrome.browserAction && !this.sidebarAction)) {
if (!chrome.browserAction && !this.sidebarAction) {
return;
}