| 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 2c70f98a57b5b755952093156b1ea427a10a440b..2b832256440aaea85e17d03f15de4b8d3e6f1dc8 100644
|
| --- a/chrome/browser/ui/passwords/manage_passwords_bubble_model.cc
|
| +++ b/chrome/browser/ui/passwords/manage_passwords_bubble_model.cc
|
| @@ -13,6 +13,7 @@
|
| #include "chrome/browser/ui/browser_finder.h"
|
| #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
|
| #include "chrome/browser/ui/passwords/password_bubble_experiment.h"
|
| +#include "chrome/common/url_constants.h"
|
| #include "chrome/grit/chromium_strings.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "components/feedback/feedback_data.h"
|
| @@ -119,10 +120,19 @@ ManagePasswordsBubbleModel::ManagePasswordsBubbleModel(
|
| if (state_ == password_manager::ui::CONFIRMATION_STATE) {
|
| base::string16 save_confirmation_link =
|
| l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_LINK);
|
| + int confirmation_text_id = IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TEXT;
|
| + if (password_bubble_experiment::IsSmartLockBrandingEnabled(GetProfile())) {
|
| + std::string management_hostname =
|
| + GURL(chrome::kPasswordManagerAccountDashboardURL).host();
|
| + save_confirmation_link = base::UTF8ToUTF16(management_hostname);
|
| + confirmation_text_id =
|
| + IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_SMART_LOCK_TEXT;
|
| + }
|
| +
|
| size_t offset;
|
| save_confirmation_text_ =
|
| - l10n_util::GetStringFUTF16(IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TEXT,
|
| - save_confirmation_link, &offset);
|
| + l10n_util::GetStringFUTF16(
|
| + confirmation_text_id, save_confirmation_link, &offset);
|
| save_confirmation_link_range_ =
|
| gfx::Range(offset, offset + save_confirmation_link.length());
|
| }
|
| @@ -239,8 +249,13 @@ void ManagePasswordsBubbleModel::OnOKClicked() {
|
|
|
| void ManagePasswordsBubbleModel::OnManageLinkClicked() {
|
| dismissal_reason_ = metrics_util::CLICKED_MANAGE;
|
| - ManagePasswordsUIController::FromWebContents(web_contents())
|
| - ->NavigateToPasswordManagerSettingsPage();
|
| + if (password_bubble_experiment::IsSmartLockBrandingEnabled(GetProfile())) {
|
| + ManagePasswordsUIController::FromWebContents(web_contents())
|
| + ->NavigateToExternalPasswordManager();
|
| + } else {
|
| + ManagePasswordsUIController::FromWebContents(web_contents())
|
| + ->NavigateToPasswordManagerSettingsPage();
|
| + }
|
| }
|
|
|
| void ManagePasswordsBubbleModel::OnBrandLinkClicked() {
|
| @@ -314,7 +329,7 @@ void ManagePasswordsBubbleModel::UpdatePendingStateTitle() {
|
| title_ = l10n_util::GetStringUTF16(
|
| IDS_MANAGE_PASSWORDS_BLACKLIST_CONFIRMATION_TITLE);
|
| } else if (password_bubble_experiment::IsSmartLockBrandingEnabled(
|
| - GetProfile())) {
|
| + GetProfile())) {
|
| // "Google Smart Lock" should be a hyperlink.
|
| base::string16 brand_link =
|
| l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_SMART_LOCK);
|
|
|