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

chrome/browser/resources/options/password_manager.js

 // Copyright (c) 2012 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.
 
 cr.define('options', function() {
   /** @const */ var Page = cr.ui.pageManager.Page;
   /** @const */ var PageManager = cr.ui.pageManager.PageManager;
   /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel;
 
   /////////////////////////////////////////////////////////////////////////////
@@ skipping 160 matching lines @@
      */
     updateOriginsEliding_: function(list) {
       var entries = list.getElementsByClassName('deletable-item');
       if (entries.length == 0)
         return;
       var entry = entries[0];
       var computedStyle = window.getComputedStyle(entry.urlDiv);
       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);
       }
     },
 
     /**
      * Updates the data model for the saved passwords list with the values from
      * |entries|.
      * @param {!Array} entries The list of saved password data.
      */
     setSavedPasswordsList_: function(entries) {
       if (this.lastQuery_) {
         // Implement password searching here in javascript, rather than in C++.
         // The number of saved passwords shouldn't be too big for us to handle.
         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.
             entry[options.passwordManager.ORIGINAL_INDEX_FIELD] = index;
             return true;
           }
           return false;
         };
         entries = entries.filter(filter);
       }
@@ skipping 68 matching lines @@
     'setPasswordExceptionsList',
     'showPassword'
   ]);
 
   // Export
   return {
     PasswordManager: PasswordManager
   };
 
 });