Displaying human-readable Android credentials on Android OS.

chrome/browser/android/password_ui_view_android.cc

Index: chrome/browser/android/password_ui_view_android.cc
diff --git a/chrome/browser/android/password_ui_view_android.cc b/chrome/browser/android/password_ui_view_android.cc
index 4cc4ea7688bdbab9f4dfcd24862ebce289de9d95..33d7108b5ead2dc41686e29e5cc274447c1f76a8 100644
--- a/chrome/browser/android/password_ui_view_android.cc
+++ b/chrome/browser/android/password_ui_view_android.cc
@@ -2,11 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/android/password_ui_view_android.h"
-
 #include "base/android/jni_string.h"
 #include "base/android/jni_weak_ref.h"
+#include "base/bind.h"
+#include "base/command_line.h"
+#include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
+#include "base/metrics/user_metrics_action.h"
+#include "base/strings/string_piece.h"
+#include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/android/password_ui_view_android.h"

[vabr (Chromium), 2016/06/08 07:51:33]

Please keep this #include where it was (above all the other #includes, separated
by a blank line). See
https://google.github.io/styleguide/cppguide.html#Names_and_Order_of_Includes
for the guidance on the #include order.

[dozsa, 2016/06/08 11:22:29]

Done.

 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "components/autofill/core/common/password_form.h"
@@ -14,12 +21,25 @@
 #include "components/password_manager/core/browser/affiliation_utils.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/experiments.h"
 #include "jni/PasswordUIView_jni.h"
 
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
+using base::StringPiece;
+using password_manager::PasswordStore;
+
+const int kAndroidAppSchemeAndDelimiterLength = 10;  // Length of 'android://'.

[vabr (Chromium), 2016/06/08 07:51:34]

Please move kAndroidAppSchemeAndDelimiterLength and SplitByDotAndReverse to
components/password_manager/core/browser/password_ui_utils.*, and use them both
here and in chrome/browser/ui/passwords/password_manager_presenter.cc.

We should avoid code duplication as much as possible, to ensure the two
implementations do not diverge (and also to reduce the binary size).

[dozsa, 2016/06/08 11:22:29]

Done.

+
+// Reverse order of subdomains in hostname.
+std::string SplitByDotAndReverse(StringPiece host) {
+  std::vector<std::string> parts =
+      base::SplitString(host, ".", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  std::reverse(parts.begin(), parts.end());
+  return base::JoinString(parts, ".");
+}
 
 PasswordUIViewAndroid::PasswordUIViewAndroid(JNIEnv* env, jobject obj)
     : password_manager_presenter_(this), weak_java_ui_controller_(env, obj) {}
@@ -82,8 +102,20 @@ ScopedJavaLocalRef<jobject> PasswordUIViewAndroid::GetSavedPasswordEntry(
         ConvertUTF8ToJavaString(env, std::string()).obj(),
         ConvertUTF16ToJavaString(env, base::string16()).obj());
   }
+  bool is_android_uri = false;
+  bool is_clickable = false;
+  GURL link_url;
   std::string human_readable_origin =
-      password_manager::GetHumanReadableOrigin(*form);
+      password_manager::GetShownOriginAndLinkUrl(*form, &is_android_uri,
+                                                 &link_url,
+                                                 &is_clickable);
+  if (!is_clickable) {
+    human_readable_origin = SplitByDotAndReverse(
+        StringPiece(&human_readable_origin[kAndroidAppSchemeAndDelimiterLength],
+                    human_readable_origin.length() -
+                    kAndroidAppSchemeAndDelimiterLength));
+    human_readable_origin = human_readable_origin + " (Android)";
+  }
   return Java_PasswordUIView_createSavedPasswordEntry(
       env, ConvertUTF8ToJavaString(env, human_readable_origin).obj(),
       ConvertUTF16ToJavaString(env, form->username_value).obj());
@@ -97,8 +129,21 @@ ScopedJavaLocalRef<jstring> PasswordUIViewAndroid::GetSavedPasswordException(
       password_manager_presenter_.GetPasswordException(index);
   if (!form)
     return ConvertUTF8ToJavaString(env, std::string());
+  bool is_android_uri = false;
+  bool is_clickable = false;
+  GURL link_url;
   std::string human_readable_origin =
-      password_manager::GetHumanReadableOrigin(*form);
+        password_manager::GetShownOriginAndLinkUrl(*form, &is_android_uri,
+                                                   &link_url,
+                                                   &is_clickable);
+  if (!is_clickable) {
+      human_readable_origin = SplitByDotAndReverse(
+          StringPiece
+          (&human_readable_origin[kAndroidAppSchemeAndDelimiterLength],
+                      human_readable_origin.length() -
+                      kAndroidAppSchemeAndDelimiterLength));
+      human_readable_origin = human_readable_origin + " (Android)";
+    }
   return ConvertUTF8ToJavaString(env, human_readable_origin);
 }