[Password manager] Human readable origins for Android credentials on chrome://settings/passwords

chrome/browser/resources/options/password_manager.js

Index: chrome/browser/resources/options/password_manager.js
diff --git a/chrome/browser/resources/options/password_manager.js b/chrome/browser/resources/options/password_manager.js
index f5bfb01ee192509520a3bf034737ff02e70d7612..a4938d133f765d0039b38c84b2673c156af19392 100644
--- a/chrome/browser/resources/options/password_manager.js
+++ b/chrome/browser/resources/options/password_manager.js
@@ -178,12 +178,21 @@ cr.define('options', function() {
       var columnWidth = entry.urlDiv.offsetWidth -
           parseInt(computedStyle.webkitMarginStart) -
           parseInt(computedStyle.webkitPaddingStart);
+
       for (var i = 0; i < entries.length; ++i) {
-        var urlLink = entries[i].urlLink;
-        if (entries[i].isAndroidUri || urlLink.offsetWidth <= columnWidth)
+        entry = entries[i];
+        // For android://com.example, elide from the right.
+        if (!entry.isClickable)
+          continue;
+        var cellWidth = columnWidth;
+        if (entry.androidSpan)
+          cellWidth -= entry.androidSpan.offsetWidth;
+
+        var urlLink = entry.urlLink;
+        if (urlLink.offsetWidth <= cellWidth)
           continue;
         urlLink.textContent = '…' + urlLink.textContent.substring(1);
-        while (urlLink.offsetWidth > columnWidth)
+        while (urlLink.offsetWidth > cellWidth)
           urlLink.textContent = '…' + urlLink.textContent.substring(2);
       }
     },
@@ -200,9 +209,9 @@ cr.define('options', function() {
         var query = this.lastQuery_;
         var filter = function(entry, index, list) {
           // Search both shown URL and username.
-          var shownUrl = entry[options.passwordManager.SHOWN_URL_FIELD];
+          var shownOrigin = entry[options.passwordManager.SHOWN_ORIGIN_FIELD];
           var username = entry[options.passwordManager.USERNAME_FIELD];
-          if (shownUrl.toLowerCase().indexOf(query.toLowerCase()) >= 0 ||
+          if (shownOrigin.toLowerCase().indexOf(query.toLowerCase()) >= 0 ||
               username.toLowerCase().indexOf(query.toLowerCase()) >= 0) {
             // Keep the original index so we can delete correctly. See also
             // deleteItemAtIndex() in password_manager_list.js that uses this.