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..99949be180d1355967bf1e0f5c7d52fbf53b7a94 100644
--- a/chrome/browser/android/password_ui_view_android.cc
+++ b/chrome/browser/android/password_ui_view_android.cc
@@ -6,7 +6,15 @@
 
 #include "base/android/jni_string.h"
 #include "base/android/jni_weak_ref.h"
+#include "base/bind.h"

[vabr (Chromium), 2016/06/08 09:04:04]

None of the added #includes except for string_piece.h and password_ui_utils.h
seem to be needed. Could you drop them?

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

Done.

+#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/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "components/autofill/core/common/password_form.h"
@@ -14,12 +22,15 @@
 #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;

[vabr (Chromium), 2016/06/08 09:04:04]

optional: Inlining "base::" in the code below is not changing how the lines are
broken, so I'd recommend dropping the using directive in this case.

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

Done.

+using password_manager::PasswordStore;

[vabr (Chromium), 2016/06/08 09:04:05]

Appears unused, please remove.

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

Done.

 
 PasswordUIViewAndroid::PasswordUIViewAndroid(JNIEnv* env, jobject obj)
     : password_manager_presenter_(this), weak_java_ui_controller_(env, obj) {}
@@ -82,8 +93,23 @@ ScopedJavaLocalRef<jobject> PasswordUIViewAndroid::GetSavedPasswordEntry(
         ConvertUTF8ToJavaString(env, std::string()).obj(),
         ConvertUTF16ToJavaString(env, base::string16()).obj());
   }
+  bool is_android_uri = false;

[vabr (Chromium), 2016/06/08 09:04:04]

The block here is identical to the one on lines 126-142.

Please define a helper function in the anonymous namespace instead and call it
here and below.

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

Done.

+  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 = password_manager::SplitByDotAndReverse(
+        StringPiece(
+            &human_readable_origin[
+                                   password_manager::
+                                   kAndroidAppSchemeAndDelimiterLength],
+                                   human_readable_origin.length() -
+                    password_manager::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 +123,23 @@ 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 = password_manager::SplitByDotAndReverse(
+          StringPiece
+          (&human_readable_origin[
+                                  password_manager::
+                                  kAndroidAppSchemeAndDelimiterLength],
+                      human_readable_origin.length() -
+                      password_manager::kAndroidAppSchemeAndDelimiterLength));
+      human_readable_origin = human_readable_origin + " (Android)";
+    }
   return ConvertUTF8ToJavaString(env, human_readable_origin);
 }