diff options
| -rw-r--r-- | chrome/browser/ui/passwords/manage_passwords_view_utils.cc | 18 | ||||
| -rw-r--r-- | chrome/browser/ui/passwords/manage_passwords_view_utils_unittest.cc | 13 |
2 files changed, 28 insertions, 3 deletions
diff --git a/chrome/browser/ui/passwords/manage_passwords_view_utils.cc b/chrome/browser/ui/passwords/manage_passwords_view_utils.cc index 338dd3e..274d754 100644 --- a/chrome/browser/ui/passwords/manage_passwords_view_utils.cc +++ b/chrome/browser/ui/passwords/manage_passwords_view_utils.cc @@ -96,7 +96,14 @@ void GetSavePasswordDialogTitleTextAndLinkRange( // Check whether the registry controlled domains for user-visible URL (i.e. // the one seen in the omnibox) and the password form post-submit navigation // URL differs or not. - if (!SameDomainOrHost(user_visible_url, form_origin_url)) { + password_manager::FacetURI facet_uri = + password_manager::FacetURI::FromPotentiallyInvalidSpec( + form_origin_url.spec()); + if (facet_uri.IsValidAndroidFacetURI()) { + title_id = IDS_SAVE_PASSWORD_TITLE; + replacements.push_back( + base::ASCIIToUTF16(GetHumanReadableOriginForAndroidUri(facet_uri))); + } else if (!SameDomainOrHost(user_visible_url, form_origin_url)) { title_id = IDS_SAVE_PASSWORD_TITLE; // TODO(palmer): Look into passing real language prefs here, not "". // crbug.com/498069. @@ -126,7 +133,14 @@ void GetManagePasswordsDialogTitleText(const GURL& user_visible_url, // Check whether the registry controlled domains for user-visible URL // (i.e. the one seen in the omnibox) and the managed password origin URL // differ or not. - if (!SameDomainOrHost(user_visible_url, password_origin_url)) { + password_manager::FacetURI facet_uri = + password_manager::FacetURI::FromPotentiallyInvalidSpec( + password_origin_url.spec()); + if (facet_uri.IsValidAndroidFacetURI()) { + *title = l10n_util::GetStringFUTF16( + IDS_MANAGE_PASSWORDS_TITLE_DIFFERENT_DOMAIN, + base::ASCIIToUTF16(GetHumanReadableOriginForAndroidUri(facet_uri))); + } else if (!SameDomainOrHost(user_visible_url, password_origin_url)) { // TODO(palmer): Look into passing real language prefs here, not "". base::string16 formatted_url = url_formatter::FormatUrlForSecurityDisplay( password_origin_url, std::string()); diff --git a/chrome/browser/ui/passwords/manage_passwords_view_utils_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_view_utils_unittest.cc index 15f0828..946be45 100644 --- a/chrome/browser/ui/passwords/manage_passwords_view_utils_unittest.cc +++ b/chrome/browser/ui/passwords/manage_passwords_view_utils_unittest.cc @@ -80,7 +80,18 @@ const struct { PasswordTittleType::SAVE_ACCOUNT, "this site", 0, 0}, {"https://a.example.com/landing", "https://b.example.com/login#form?value=3", true, - PasswordTittleType::SAVE_ACCOUNT, "this site", 12, 29}}; + PasswordTittleType::SAVE_ACCOUNT, "this site", 12, 29}, + + // Android update. + {"https://another.org", "android://m3HSJL1i83hdltRq0-o9czGb-8KJDKra4t_3JR" + "lnPKcjI8PZm6XBHXx6zG4UuMXaDEZjR1wuXDre9G9zvN7AQw==@com.example.android", + false, PasswordTittleType::SAVE_PASSWORD, "android://com.example.android", + 0, 0}, + {"https://another.org","android://m3HSJL1i83hdltRq0-o9czGb-8KJDKra4t_3JR" + "lnPKcjI8PZm6XBHXx6zG4UuMXaDEZjR1wuXDre9G9zvN7AQw==@com.example.android", + true, PasswordTittleType::SAVE_PASSWORD, "android://com.example.android", + 12, 29}, +}; } // namespace |