chrome/browser/ui/passwords/manage_passwords_bubble_model.cc - Issue 1138523005: [Smart Lock] Update password generation prompt to conditionally use new branding

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 1138523005: [Smart Lock] Update password generation prompt to conditionally use new branding (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Cleanup Created 5 years, 7 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

« chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc ('K') | « chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc ('k') | chrome/browser/ui/passwords/password_bubble_experiment.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 dd9ed490fe52d5216b200c0d4ede4c6e0a76bffb..2c70f98a57b5b755952093156b1ea427a10a440b 100644

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

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

@@ -118,7 +118,7 @@ ManagePasswordsBubbleModel::ManagePasswordsBubbleModel(

if (state_ == password_manager::ui::CONFIRMATION_STATE) {

base::string16 save_confirmation_link =

- l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_LINK);

+ l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_LINK);

size_t offset;

save_confirmation_text_ =

l10n_util::GetStringFUTF16(IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TEXT,

@@ -313,7 +313,7 @@ void ManagePasswordsBubbleModel::UpdatePendingStateTitle() {

if (never_save_passwords_) {

title_ = l10n_util::GetStringUTF16(

IDS_MANAGE_PASSWORDS_BLACKLIST_CONFIRMATION_TITLE);

- } else if (password_bubble_experiment::IsEnabledSmartLockBranding(

+ } else if (password_bubble_experiment::IsSmartLockBrandingEnabled(

GetProfile())) {

// "Google Smart Lock" should be a hyperlink.

base::string16 brand_link =