Credential saving clank infobar for Smart Lock.

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 "base/strings/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/ui/android/infobars/save_password_infobar.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_form_manager.h"
-#include "content/public/browser/navigation_entry.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"
 
+namespace {
+
+int GetCancelButtonText(password_manager::CredentialSourceType source_type) {
+  return source_type ==

[Bernhard Bauer, 2015/03/02 10:28:09]

This seems to be indented a bit weirdly... Could you run it through
clang-format?

[Mike West, 2015/03/02 11:54:27]

It's weird enough that I have to assume clang-format is responsible. :)

[melandory, 2015/03/03 11:55:46]

Done.

[melandory, 2015/03/03 11:55:46]

Yeah, Mike is right :)

+                 password_manager::CredentialSourceType::CREDENTIAL_SOURCE_API
+             ? IDS_PASSWORD_MANAGER_SAVE_PASSWORD_SMART_LOCK_NO_THANKS_BUTTON
+             : IDS_PASSWORD_MANAGER_BLACKLIST_BUTTON;
+}
+
+}  // namespace
+
 // static
 void SavePasswordInfoBarDelegate::Create(
     content::WebContents* web_contents,
     scoped_ptr<password_manager::PasswordFormManager> form_to_save,
-    const std::string& uma_histogram_suffix) {
+    const std::string& uma_histogram_suffix,
+    password_manager::CredentialSourceType source_type) {
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents);
+#if defined(OS_ANDROID)
+  // For android in case of smart lock we need different appearance of

[Bernhard Bauer, 2015/03/02 10:28:09]

Nit: Capitalize Android (you're not talking about a robot :) ).

[melandory, 2015/03/03 11:55:46]

Done.

+  // save password infobar.
+  infobar_service->AddInfoBar(make_scoped_ptr(new SavePasswordInfoBar(
+      scoped_ptr<SavePasswordInfoBarDelegate>(new SavePasswordInfoBarDelegate(

[Bernhard Bauer, 2015/03/02 10:28:09]

Extract the delegate and the infobar into local variables, then you only have to
#ifdef the infobar constructor.

[...]

[melandory, 2015/03/03 11:55:46]

Done.

+          form_to_save.Pass(), uma_histogram_suffix, source_type)))));
+#else
+  // For desktop we'll keep using confirm ifobar.

[Bernhard Bauer, 2015/03/02 10:28:09]

"[...] the infobar" (with an "n" and an article).

[gone, 2015/03/02 17:39:38]

nit: may as well say ConfirmInfobar since it's a specific class type.

[melandory, 2015/03/03 11:55:46]

Done.

[melandory, 2015/03/03 11:55:46]

Done.

   infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar(
       scoped_ptr<ConfirmInfoBarDelegate>(new SavePasswordInfoBarDelegate(
-          form_to_save.Pass(), uma_histogram_suffix))));
+          form_to_save.Pass(), uma_histogram_suffix, source_type))));
+#endif
 }
 
 SavePasswordInfoBarDelegate::~SavePasswordInfoBarDelegate() {
   UMA_HISTOGRAM_ENUMERATION("PasswordManager.InfoBarResponse",
                             infobar_response_,
                             password_manager::metrics_util::NUM_RESPONSE_TYPES);
 
   password_manager::metrics_util::LogUIDismissalReason(infobar_response_);
 
   // The shortest period for which the prompt needs to live, so that we don't
   // consider it killed prematurely, as might happen, e.g., if a pre-rendered
   // page gets swapped in (and the current WebContents is destroyed).
   const base::TimeDelta kMinimumPromptDisplayTime =
       base::TimeDelta::FromSeconds(1);
 
   if (!uma_histogram_suffix_.empty()) {
     password_manager::metrics_util::LogUMAHistogramEnumeration(
         "PasswordManager.SavePasswordPromptResponse_" + uma_histogram_suffix_,
         infobar_response_,
         password_manager::metrics_util::NUM_RESPONSE_TYPES);
     password_manager::metrics_util::LogUMAHistogramBoolean(
         "PasswordManager.SavePasswordPromptDisappearedQuickly_" +
             uma_histogram_suffix_,
         timer_.Elapsed() < kMinimumPromptDisplayTime);
   }
 }
 
 SavePasswordInfoBarDelegate::SavePasswordInfoBarDelegate(
     scoped_ptr<password_manager::PasswordFormManager> form_to_save,
-    const std::string& uma_histogram_suffix)
+    const std::string& uma_histogram_suffix,
+    password_manager::CredentialSourceType source_type)
     : ConfirmInfoBarDelegate(),
       form_to_save_(form_to_save.Pass()),
       infobar_response_(password_manager::metrics_util::NO_RESPONSE),
-      uma_histogram_suffix_(uma_histogram_suffix) {
+      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);
   }
 }
 
+bool SavePasswordInfoBarDelegate::ShouldShowMoreButton() {
+  return source_type_ ==
+         password_manager::CredentialSourceType::CREDENTIAL_SOURCE_API;
+}
+
 infobars::InfoBarDelegate::Type
 SavePasswordInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
 infobars::InfoBarDelegate::InfoBarAutomationType
 SavePasswordInfoBarDelegate::GetInfoBarAutomationType() const {
   return PASSWORD_INFOBAR;
 }
 
 int SavePasswordInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_SAVE_PASSWORD;
 }
 
 bool SavePasswordInfoBarDelegate::ShouldExpire(
     const NavigationDetails& details) const {
   return !details.is_redirect &&
          infobars::InfoBarDelegate::ShouldExpire(details);
 }
 
 void SavePasswordInfoBarDelegate::InfoBarDismissed() {
   DCHECK(form_to_save_.get());
   infobar_response_ = password_manager::metrics_util::INFOBAR_DISMISSED;
 }
 
 base::string16 SavePasswordInfoBarDelegate::GetMessageText() const {
-  return l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT);
+  return l10n_util::GetStringUTF16(
+      (source_type_ ==
+       password_manager::CredentialSourceType::CREDENTIAL_SOURCE_API)
+          ? IDS_PASSWORD_MANAGER_SAVE_PASSWORD_SMART_LOCK_PROMPT
+          : IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT);
 }
 
 base::string16 SavePasswordInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
-  return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
-      IDS_PASSWORD_MANAGER_SAVE_BUTTON : IDS_PASSWORD_MANAGER_BLACKLIST_BUTTON);
+  return l10n_util::GetStringUTF16((button == BUTTON_OK)
+                                       ? IDS_PASSWORD_MANAGER_SAVE_BUTTON
+                                       : GetCancelButtonText(source_type_));
 }
 
 bool SavePasswordInfoBarDelegate::Accept() {
   DCHECK(form_to_save_.get());
   form_to_save_->Save();
   infobar_response_ = password_manager::metrics_util::REMEMBER_PASSWORD;
   return true;
 }
 
 bool SavePasswordInfoBarDelegate::Cancel() {
   DCHECK(form_to_save_.get());
-  form_to_save_->PermanentlyBlacklist();
-  infobar_response_ = password_manager::metrics_util::NEVER_REMEMBER_PASSWORD;
+  if (source_type_ ==
+      password_manager::CredentialSourceType::CREDENTIAL_SOURCE_API) {
+    form_to_save_->PermanentlyBlacklist();
+    infobar_response_ = password_manager::metrics_util::NEVER_REMEMBER_PASSWORD;
+  } else {
+    InfoBarDismissed();
+  }
   return true;
 }