chrome/browser/ui/passwords/manage_passwords_bubble_model.cc - Issue 1297963002: Implemented showing update bubble pop-up on password overriding

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/passwords/manage_passwords_bubble_model.cc

Issue 1297963002: Implemented showing update bubble pop-up on password overriding (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Comments were addressed Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/passwords/manage_passwords_bubble_model.h ('k') | chrome/browser/ui/passwords/manage_passwords_ui_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/passwords/manage_passwords_bubble_model.cc

diff --git a/chrome/browser/ui/passwords/manage_passwords_bubble_model.cc b/chrome/browser/ui/passwords/manage_passwords_bubble_model.cc

index 8aea0125a479920de444b09574baa0093713edc0..3f50dede3343639a6125c16a3fb397ade03e3f60 100644

--- a/chrome/browser/ui/passwords/manage_passwords_bubble_model.cc

+++ b/chrome/browser/ui/passwords/manage_passwords_bubble_model.cc

@@ -96,6 +96,7 @@ ManagePasswordsBubbleModel::ManagePasswordsBubbleModel(

origin_ = controller->origin();

state_ = controller->state();

+ password_overridden_ = controller->PasswordOverridden();

if (state_ == password_manager::ui::PENDING_PASSWORD_STATE ||

state_ == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE) {

pending_password_ = controller->PendingPassword();

@@ -336,7 +337,7 @@ bool ManagePasswordsBubbleModel::IsNewUIActive() const {

bool ManagePasswordsBubbleModel::ShouldShowMultipleAccountUpdateUI() const {

return state_ == password_manager::ui::PENDING_PASSWORD_UPDATE_STATE &&

- local_credentials_.size() > 1;

+ local_credentials_.size() > 1 && !password_overridden_;

}

// static