[Smart Lock, UI] Display origin in account chooser dialog.

BUG=454815

Review URL: https://codereview.chromium.org/1627193003

Cr-Commit-Position: refs/heads/master@{#371488}

chrome/android/java/res/layout/account_chooser_dialog_title.xml

@@ -15,4 +15,11 @@
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:textAppearance="?android:attr/textAppearanceLarge"/>
+    <TextView
+        android:id="@+id/origin"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"/>
+
 </LinearLayout>

chrome/android/java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java

@@ -46,6 +46,7 @@ public class AccountChooserDialog
     private final String mTitle;
     private final int mTitleLinkStart;
     private final int mTitleLinkEnd;
+    private final String mOrigin;
     private ArrayAdapter<Credential> mAdapter;
 
     /**
@@ -56,7 +57,8 @@ public class AccountChooserDialog
     private AlertDialog mDialog;
 
     private AccountChooserDialog(Context context, long nativeAccountChooserDialog,
-            Credential[] credentials, String title, int titleLinkStart, int titleLinkEnd) {
+            Credential[] credentials, String title, int titleLinkStart, int titleLinkEnd,
+            String origin) {
         mNativeAccountChooserDialog = nativeAccountChooserDialog;
         mContext = context;
         mCredentials = credentials.clone();
@@ -64,6 +66,7 @@ public class AccountChooserDialog
         mTitle = title;
         mTitleLinkStart = titleLinkStart;
         mTitleLinkEnd = titleLinkEnd;
+        mOrigin = origin;
     }
 
     /**
@@ -72,15 +75,17 @@ public class AccountChooserDialog
      *  @param title Title message for the dialog, which can contain Smart Lock branding.
      *  @param titleLinkStart Start of a link in case title contains Smart Lock branding.
      *  @param titleLinkEnd End of a link in case title contains Smart Lock branding.
+     *  @param origin Address of the web page, where dialog was triggered.
      */
     @CalledByNative
     private static AccountChooserDialog createAccountChooser(WindowAndroid windowAndroid,
             long nativeAccountChooserDialog, Credential[] credentials, String title,
-            int titleLinkStart, int titleLinkEnd) {
+            int titleLinkStart, int titleLinkEnd, String origin) {
         Activity activity = windowAndroid.getActivity().get();
         if (activity == null) return null;
-        AccountChooserDialog chooser = new AccountChooserDialog(activity,
-                nativeAccountChooserDialog, credentials, title, titleLinkStart, titleLinkEnd);
+        AccountChooserDialog chooser =
+                new AccountChooserDialog(activity, nativeAccountChooserDialog, credentials, title,
+                        titleLinkStart, titleLinkEnd, origin);
         chooser.show(activity.getFragmentManager(), null);
         return chooser;
     }
@@ -129,8 +134,9 @@ public class AccountChooserDialog
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         View titleView =
                 LayoutInflater.from(mContext).inflate(R.layout.account_chooser_dialog_title, null);
+        TextView origin = (TextView) titleView.findViewById(R.id.origin);
+        origin.setText(mOrigin);
         TextView titleMessageText = (TextView) titleView.findViewById(R.id.title);
-        // TODO(melandory): add support for showing site origin in the title.
         if (mTitleLinkStart != 0 && mTitleLinkEnd != 0) {
             SpannableString spanableTitle = new SpannableString(mTitle);
             spanableTitle.setSpan(new ClickableSpan() {

chrome/browser/password_manager/account_chooser_dialog_android.cc

@@ -20,6 +20,7 @@
 #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_ui_utils.h"
 #include "components/password_manager/core/common/credential_manager_types.h"
 #include "jni/AccountChooserDialog_jni.h"
 #include "ui/android/window_android.h"
@@ -109,7 +110,7 @@ AccountChooserDialogAndroid::AccountChooserDialogAndroid(
     ScopedVector<autofill::PasswordForm> federated_credentials,
     const GURL& origin,
     const ManagePasswordsState::CredentialsCallback& callback)
-    : web_contents_(web_contents) {
+    : web_contents_(web_contents), origin_(origin) {
   passwords_data_.set_client(
       ChromePasswordManagerClient::FromWebContents(web_contents_));
   passwords_data_.OnRequestCredentials(
@@ -146,7 +147,10 @@ void AccountChooserDialogAndroid::ShowDialog() {
       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()));
+      title_link_range.start(), title_link_range.end(),
+      base::android::ConvertUTF8ToJavaString(
+          env, password_manager::GetShownOrigin(origin_, std::string()))
+          .obj()));
   base::android::ScopedJavaLocalRef<jobject> java_dialog(java_dialog_global);
   net::URLRequestContextGetter* request_context =
       Profile::FromBrowserContext(web_contents_->GetBrowserContext())

chrome/browser/password_manager/account_chooser_dialog_android.h

@@ -63,6 +63,7 @@ class AccountChooserDialogAndroid {
 
   content::WebContents* web_contents_;
   ManagePasswordsState passwords_data_;
+  GURL origin_;
 
   DISALLOW_COPY_AND_ASSIGN(AccountChooserDialogAndroid);
 };

components/password_manager/core/browser/password_ui_utils.cc

@@ -33,9 +33,12 @@ std::string GetShownOrigin(const autofill::PasswordForm& password_form,
   if (*is_android_uri)
     return GetHumanReadableOriginForAndroidUri(facet_uri);
 
-  std::string original =
-      base::UTF16ToUTF8(url_formatter::FormatUrlForSecurityDisplayOmitScheme(
-          password_form.origin, languages));
+  return GetShownOrigin(password_form.origin, languages);
+}
+
+std::string GetShownOrigin(const GURL& origin, const std::string& languages) {
+  std::string original = base::UTF16ToUTF8(
+      url_formatter::FormatUrlForSecurityDisplayOmitScheme(origin, languages));
   base::StringPiece result = original;
   for (base::StringPiece prefix : kRemovedPrefixes) {
     if (base::StartsWith(result, prefix,

components/password_manager/core/browser/password_ui_utils.h

@@ -27,6 +27,11 @@ std::string GetShownOrigin(const autofill::PasswordForm& password_form,
                            const std::string& languages,
                            bool* is_android_uri);
 
+// Returns a string suitable for security display to the user (just like
+// |FormatUrlForSecurityDisplayOmitScheme| based on origin of |password_form|
+// and |languages|) and without prefixes "m.", "mobile." or "www.".
+std::string GetShownOrigin(const GURL& origin, const std::string& languages);
+
 }  // namespace password_manager
 
 #endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_UI_UTILS_H_

components/password_manager/core/browser/password_ui_utils_unittest.cc

@@ -38,6 +38,7 @@ TEST(GetShownOriginTest, RemovePrefixes) {
               GetShownOrigin(password_form, "", &is_android_uri))
         << "for input " << test_case.input;
     EXPECT_FALSE(is_android_uri) << "for input " << test_case.input;
+    EXPECT_EQ(test_case.output, GetShownOrigin(password_form.origin, ""));
   }
 }