[CM API] Account Chooser with Sign in button for single account

chrome/browser/password_manager/account_chooser_dialog_android.cc

 // Copyright 2015 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/account_chooser_dialog_android.h"
 
 #include <utility>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
 #include "chrome/browser/password_manager/credential_android.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/passwords/account_avatar_fetcher.h"
 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/browser_sync/browser/profile_sync_service.h"
 #include "components/password_manager/core/browser/password_bubble_experiment.h"
 #include "components/password_manager/core/browser/password_manager_constants.h"
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
 #include "components/password_manager/core/browser/password_ui_utils.h"
 #include "components/password_manager/core/common/credential_manager_types.h"
 #include "jni/AccountChooserDialog_jni.h"
 #include "ui/android/window_android.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/range/range.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF16ToJavaString;
 
 namespace {
 
 void AddElementsToJavaCredentialArray(
     JNIEnv* env,
@@ skipping 102 matching lines @@
   ScopedJavaLocalRef<jobjectArray> java_credentials_array =
       CreateNativeCredentialArray(env, credential_array_size);
   AddElementsToJavaCredentialArray(
       env, java_credentials_array, local_credentials_forms(),
       password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD);
   AddElementsToJavaCredentialArray(
       env, java_credentials_array, federated_credentials_forms(),
       password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED,
       local_credentials_forms().size());
   base::android::ScopedJavaGlobalRef<jobject> java_dialog_global;
+  const std::string origin = password_manager::GetShownOrigin(origin_);
+  base::string16 signin_button;
+  if (local_credentials_forms().size() == 1) {
+    signin_button =
+        l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_ACCOUNT_CHOOSER_SIGN_IN);
+  }
   dialog_jobject_.Reset(Java_AccountChooserDialog_createAndShowAccountChooser(
       env, native_window->GetJavaObject().obj(),
       reinterpret_cast<intptr_t>(this), java_credentials_array.obj(),
       base::android::ConvertUTF16ToJavaString(env, title).obj(),
       title_link_range.start(), title_link_range.end(),
-      base::android::ConvertUTF8ToJavaString(
-          env, password_manager::GetShownOrigin(origin_))
-          .obj()));
+      base::android::ConvertUTF8ToJavaString(env, origin).obj(),
+      base::android::ConvertUTF16ToJavaString(env, signin_button).obj()));
   net::URLRequestContextGetter* request_context =
       Profile::FromBrowserContext(web_contents_->GetBrowserContext())
           ->GetRequestContext();
   FetchAvatars(dialog_jobject_, local_credentials_forms(), 0, request_context);
   FetchAvatars(dialog_jobject_, federated_credentials_forms(),
                local_credentials_forms().size(), request_context);
 }
 
 void AccountChooserDialogAndroid::OnCredentialClicked(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint credential_item,
-    jint credential_type) {
+    jint credential_type,
+    jboolean signin_button_clicked) {
   ChooseCredential(
       credential_item,
-      static_cast<password_manager::CredentialType>(credential_type));
+      static_cast<password_manager::CredentialType>(credential_type),
+      signin_button_clicked);
 }
 
 void AccountChooserDialogAndroid::Destroy(JNIEnv* env,
                                           const JavaParamRef<jobject>& obj) {
   delete this;
 }
 
 void AccountChooserDialogAndroid::CancelDialog(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
@@ skipping 16 matching lines @@
 
 void AccountChooserDialogAndroid::WasHidden() {
   // TODO(https://crbug.com/610700): once bug is fixed, this code should be
   // gone.
   OnDialogCancel();
   JNIEnv* env = AttachCurrentThread();
   Java_AccountChooserDialog_dismissDialog(env, dialog_jobject_.obj());
 }
 
 void AccountChooserDialogAndroid::OnDialogCancel() {
-  ChooseCredential(-1, password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY);
+  ChooseCredential(-1, password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY,
+                   false /* signin_button_clicked */);
 }
 
 const std::vector<const autofill::PasswordForm*>&
 AccountChooserDialogAndroid::local_credentials_forms() const {
   return passwords_data_.GetCurrentForms();
 }
 
 const std::vector<const autofill::PasswordForm*>&
 AccountChooserDialogAndroid::federated_credentials_forms() const {
   return passwords_data_.federated_credentials_forms();
 }
 
 void AccountChooserDialogAndroid::ChooseCredential(
     size_t index,
-    password_manager::CredentialType type) {
+    password_manager::CredentialType type,
+    bool signin_button_clicked) {
   using namespace password_manager;
   password_manager::metrics_util::AccountChooserUserAction action;
   if (type == CredentialType::CREDENTIAL_TYPE_EMPTY) {
     passwords_data_.ChooseCredential(nullptr);
-    action = password_manager::metrics_util::ACCOUNT_CHOOSER_DISMISSED;
+    action = metrics_util::ACCOUNT_CHOOSER_DISMISSED;
   } else {
-    action = password_manager::metrics_util::ACCOUNT_CHOOSER_CREDENTIAL_CHOSEN;
+    action = signin_button_clicked
+                 ? metrics_util::ACCOUNT_CHOOSER_SIGN_IN
+                 : metrics_util::ACCOUNT_CHOOSER_CREDENTIAL_CHOSEN;
     const auto& credentials_forms =
         (type == CredentialType::CREDENTIAL_TYPE_PASSWORD)
             ? local_credentials_forms()
             : federated_credentials_forms();
     if (index < credentials_forms.size()) {
       passwords_data_.ChooseCredential(credentials_forms[index]);
     }
   }
 
   if (local_credentials_forms().size() == 1) {
     password_manager::metrics_util::LogAccountChooserUserActionOneAccount(
         action);
   } else {
     password_manager::metrics_util::LogAccountChooserUserActionManyAccounts(
         action);
   }
 }
 
 bool RegisterAccountChooserDialogAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }