[Password Manager] Replace "this site" in save password prompt with password's origin.

chrome/browser/password_manager/save_password_infobar_delegate.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/password_manager/save_password_infobar_delegate.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
+#include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/infobars/core/infobar.h"
 #include "components/password_manager/core/browser/password_bubble_experiment.h"
 #include "components/password_manager/core/browser/password_manager_client.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_ANDROID)
@@ skipping 81 matching lines @@
       form_to_save_(form_to_save.Pass()),
       infobar_response_(password_manager::metrics_util::NO_RESPONSE),
       uma_histogram_suffix_(uma_histogram_suffix),
       source_type_(source_type) {
   if (!uma_histogram_suffix_.empty()) {
     password_manager::metrics_util::LogUMAHistogramBoolean(
         "PasswordManager.SavePasswordPromptDisplayed_" + uma_histogram_suffix_,
         true);
   }
   title_link_range_ = gfx::Range();
-  if (is_smartlock_branding_enabled) {
-    size_t offset = 0;
-    base::string16 title_link =
-        l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_SMART_LOCK);
-    title_ = l10n_util::GetStringFUTF16(IDS_SAVE_PASSWORD, title_link, &offset);
-    title_link_range_ = gfx::Range(offset, offset + title_link.length());
-  } else {
-    title_ = l10n_util::GetStringFUTF16(
-        IDS_SAVE_PASSWORD,
-        l10n_util::GetStringUTF16(IDS_SAVE_PASSWORD_TITLE_BRAND));
-  }
+  GetSavePasswordDialogTitleTextAndLinkRange(
+      form_to_save_->client()->GetMainFrameURL(),

[vabr (Chromium), 2015/06/29 11:49:08]

Actually, rather than going through the PasswordFormManager to the client, could
you just keep the WebContents pointer in SavePasswordInfoBarDelegate, initialise
it in Create(), and use GetVisibleURL() as in the case of the bubble?

I prefer that we don't change the UI-agnostic code just because of UI.

The code in chrome/browser/ui/passwords/manage_passwords_view_utils.cc should
still get just the URL, not WebContents (as it was in patch set 1).

[Pritam Nikam, 2015/06/29 17:42:13]

Done.

+      form_to_save_->observed_form().origin, is_smartlock_branding_enabled,
+      &title_, &title_link_range_);
 }
 
 bool SavePasswordInfoBarDelegate::ShouldShowMoreButton() {
   return source_type_ ==
          password_manager::CredentialSourceType::CREDENTIAL_SOURCE_API;
 }
 
 infobars::InfoBarDelegate::Type
 SavePasswordInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
@@ skipping 52 matching lines @@
     WindowOpenDisposition disposition) {
   InfoBarService::WebContentsFromInfoBar(infobar())
       ->OpenURL(content::OpenURLParams(
           GURL(l10n_util::GetStringUTF16(
               IDS_PASSWORD_MANAGER_SMART_LOCK_ARTICLE)),
           content::Referrer(),
           (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
           ui::PAGE_TRANSITION_LINK, false));
   return true;
 }