Skip to content

Commit 61b6d66

Browse files
Viktor SemeniukChromium LUCI CQ
Viktor Semeniuk
authored and
Chromium LUCI CQ
committed
[Password Manager] Fix console errors related to checkup list item
This CL fixes an error when group was used before checking it for undefined. (cherry picked from commit 8729382) Bug: 1440042 Change-Id: Id6c2d437204f494d779336cedd9fb1810c538f80 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4481257 Auto-Submit: Viktor Semeniuk <vsemeniuk@google.com> Reviewed-by: Mohamed Amir Yosef <mamir@chromium.org> Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org> Cr-Original-Commit-Position: refs/heads/main@{#1136503} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4489825 Commit-Queue: Viktor Semeniuk <vsemeniuk@google.com> Cr-Commit-Position: refs/branch-heads/5735@{#126} Cr-Branched-From: 2f562e4-refs/heads/main@{#1135570}
1 parent d8005c8 commit 61b6d66

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

chrome/browser/resources/password_manager/checkup_list_item.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@
6666
</style>
6767
<div id="separator" class="hr" hidden="[[first]]"></div>
6868
<div id="list-item" focus-row-container>
69-
<site-favicon url="[[group.iconUrl]]" domain="[[group.name]]"
69+
<site-favicon url="[[getGroupIcon_(group)]]" domain="[[getGroupName_(group)]]"
7070
aria-hidden="true">
7171
</site-favicon>
7272
<div id="credentialInfo">
7373
<div id="shownUrl" class="label text-elide">
74-
[[group.name]]
74+
[[getGroupName_(group)]]
7575
</div>
7676
<div id="usernameContainer" class="cr-secondary-text label">
7777
<span id="username" class="text-elide">[[item.username]]</span>
@@ -113,7 +113,7 @@
113113
<template is="dom-if" if="[[showEditPasswordDisclaimer_]]" restamp>
114114
<edit-password-disclaimer-dialog
115115
on-edit-password-click="onEditPasswordClick_"
116-
origin="[[group.name]]"
116+
origin="[[getGroupName_(group)]]"
117117
on-close="onEditDisclaimerClosed_">
118118
</edit-password-disclaimer-dialog>
119119
</template>
@@ -125,7 +125,7 @@
125125
<template is="dom-if" if="[[showDeletePasswordDialog_]]" restamp>
126126
<delete-password-disclaimer-dialog id="deletePasswordDialog"
127127
on-delete-password-click="onDeletePasswordClick_"
128-
on-close="onDeletePasswordDialogClosed_" origin="[[group.name]]"
128+
on-close="onDeletePasswordDialogClosed_" origin="[[getGroupName_(group)]]"
129129
action-url="[[item.changePasswordUrl]]">
130130
</delete-password-disclaimer-dialog>
131131
</template>

chrome/browser/resources/password_manager/checkup_list_item.ts

+10-2
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,20 @@ export class CheckupListItemElement extends CheckupListItemElementBase {
186186
}));
187187
}
188188

189+
private getGroupName_(): string {
190+
return !this.group ? '' : this.group.name;
191+
}
192+
193+
private getGroupIcon_(): string {
194+
return !this.group ? '' : this.group.iconUrl;
195+
}
196+
189197
private getChangeButtonAriaLabel_(): string {
190-
return this.i18n('changePasswordAriaDescription', this.group.name);
198+
return this.i18n('changePasswordAriaDescription', this.getGroupName_());
191199
}
192200

193201
private getMoreButtonAriaLabel_(): string {
194-
return this.i18n('moreActionsAriaDescription', this.group.name);
202+
return this.i18n('moreActionsAriaDescription', this.getGroupName_());
195203
}
196204
}
197205

0 commit comments

Comments
 (0)