Index: chrome/browser/ui/webui/options/password_manager_handler.cc |
diff --git a/chrome/browser/ui/webui/options/password_manager_handler.cc b/chrome/browser/ui/webui/options/password_manager_handler.cc |
index 4957e1491305617bf77903d71cea2c3911afa5b2..508d95aaba622ad9aedaa7504e5439a8b59c9fc3 100644 |
--- a/chrome/browser/ui/webui/options/password_manager_handler.cc |
+++ b/chrome/browser/ui/webui/options/password_manager_handler.cc |
@@ -17,6 +17,7 @@ |
#include "chrome/browser/ui/ash/ash_util.h" |
#endif |
#include "chrome/browser/ui/passwords/manage_passwords_view_utils.h" |
+#include "chrome/browser/ui/passwords/password_bubble_experiment.h" |
#include "chrome/common/pref_names.h" |
#include "chrome/common/url_constants.h" |
#include "chrome/grit/generated_resources.h" |
@@ -74,25 +75,31 @@ void PasswordManagerHandler::GetLocalizedValues( |
}; |
RegisterStrings(localized_strings, resources, arraysize(resources)); |
- RegisterTitle(localized_strings, "passwordsPage", |
- IDS_PASSWORDS_EXCEPTIONS_WINDOW_TITLE); |
+ |
+ int title_id = IDS_PASSWORDS_EXCEPTIONS_WINDOW_TITLE; |
Evan Stade
2015/05/15 18:55:02
nit: prefer ternary
Garrett Casto
2015/05/15 20:43:00
Done.
|
+ if (password_bubble_experiment::IsSmartLockBrandingEnabled(GetProfile())) |
+ title_id = IDS_PASSWORDS_EXCEPTIONS_SMART_LOCK_WINDOW_TITLE; |
+ RegisterTitle(localized_strings, "passwordsPage", title_id); |
localized_strings->SetString("passwordManagerLearnMoreURL", |
chrome::kPasswordManagerLearnMoreURL); |
localized_strings->SetString("passwordsManagePasswordsLink", |
chrome::kPasswordManagerAccountDashboardURL); |
- std::vector<base::string16> pieces; |
- base::SplitStringDontTrim( |
- l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_REMOTE_TEXT), |
- '|', // separator |
- &pieces); |
- DCHECK_EQ(3U, pieces.size()); |
+ std::string management_hostname = |
+ GURL(chrome::kPasswordManagerAccountDashboardURL).host(); |
+ base::string16 link_text = base::UTF8ToUTF16(management_hostname); |
+ size_t offset; |
+ base::string16 full_text = l10n_util::GetStringFUTF16( |
+ IDS_MANAGE_PASSWORDS_REMOTE_TEXT, link_text, &offset); |
+ |
localized_strings->SetString("passwordsManagePasswordsBeforeLinkText", |
- pieces[0]); |
- localized_strings->SetString("passwordsManagePasswordsLinkText", pieces[1]); |
+ full_text.substr(0, offset)); |
+ localized_strings->SetString("passwordsManagePasswordsLinkText", |
+ full_text.substr(offset, |
+ offset + link_text.size())); |
localized_strings->SetString("passwordsManagePasswordsAfterLinkText", |
- pieces[2]); |
+ full_text.substr(offset + link_text.size())); |
bool disable_show_passwords = false; |