Revert "Allow editing passwords in 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 37 matching lines @@
      */
     queryDelayTimerId_: 0,
 
     /**
      * The most recent search query, or null if the query is empty.
      * @type {?string}
      * @private
      */
     lastQuery_: null,
 
-    /**
-     * Whether a search query filter is applied to the current data model.
-     * @type {boolean}
-     * @private
-     */
-    filterIsActive_: false,
-
     /** @override */
     initializePage: function() {
       Page.prototype.initializePage.call(this);
 
       $('password-manager-confirm').onclick = function() {
         PageManager.closeOverlay();
       };
 
       $('password-search-box').addEventListener('search',
           this.handleSearchQueryChange_.bind(this));
@@ skipping 83 matching lines @@
       list.hidden = empty;
       $(listPlaceHolderID).hidden = !empty;
     },
 
     /**
      * 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) {
-      this.filterIsActive_ = !!this.lastQuery_;
       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 URL and username.
           if (entry[0].toLowerCase().indexOf(query.toLowerCase()) >= 0 ||
               entry[1].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[3] = index;
             return true;
           }
           return false;
         };
         entries = entries.filter(filter);
-      } else {
-        // Adds the Add New Entry row.
-        entries.push(null);
       }
       this.savedPasswordsList_.dataModel = new ArrayDataModel(entries);
       this.updateListVisibility_(this.savedPasswordsList_);
     },
 
     /**
      * Updates the data model for the password exceptions list with the values
      * from |entries|.
      * @param {!Array} entries The list of password exception data.
      */
     setPasswordExceptionsList_: function(entries) {
       this.passwordExceptionsList_.dataModel = new ArrayDataModel(entries);
       this.updateListVisibility_(this.passwordExceptionsList_);
     },
 
     /**
      * Reveals the password for a saved password entry. This is called by the
      * backend after it has authenticated the user.
      * @param {number} index The original index of the entry in the model.
      * @param {string} password The saved password.
      */
     showPassword_: function(index, password) {
       var model = this.savedPasswordsList_.dataModel;
-      if (this.filterIsActive_) {
+      if (this.lastQuery_) {
         // When a filter is active, |index| does not represent the current
         // index in the model, but each entry stores its original index, so
         // we can find the item using a linear search.
         for (var i = 0; i < model.length; ++i) {
           if (model.item(i)[3] == index) {
             index = i;
             break;
           }
         }
       }
 
       // Reveal the password in the UI.
       var item = this.savedPasswordsList_.getListItemByIndex(index);
       item.showPassword(password);
     },
-
-    /**
-     * Forwards the validity of the origin to the Add New Entry row.
-     * @param {string} url The origin.
-     * @param {boolean} valid The validity of the origin for adding.
-     * @private
-     */
-    originValidityCheckComplete_: function(url, valid) {
-      // There is no Add New Entry row when a filter is active.
-      if (this.filterIsActive_)
-        return;
-      // Since no filter is active, the Add New Entry row always exists and its
-      // item is the last one.
-      var model = this.savedPasswordsList_.dataModel;
-      assert(model.length > 0);
-      var addRowItem = this.savedPasswordsList_.getListItemByIndex(
-          model.length - 1);
-      addRowItem.originValidityCheckComplete(url, valid);
-    },
   };
 
   /**
-   * Requests the browser to check the validity of the origin being edited by
-   * the user in the Add New Entry row.
-   * @param {string} url The origin being edited.
-   */
-  PasswordManager.checkOriginValidityForAdding = function(url) {
-    chrome.send('checkOriginValidityForAdding', [url]);
-  };
-
-  /**
-   * Adds a new password entry.
-   * @param {string} url The origin.
-   * @param {string} username The username value.
-   * @param {string} password The password value.
-   */
-  PasswordManager.addPassword = function(url, username, password) {
-    chrome.send('addPassword', [url, username, password]);
-  };
-
-  /**
-   * Updates the password value of an entry.
-   * @param {number} rowIndex The row to update.
-   * @param {string} newPassword The new password value.
-   */
-  PasswordManager.updatePassword = function(rowIndex, newPassword) {
-    chrome.send('updatePassword', [String(rowIndex), newPassword]);
-  };
-
-  /**
    * Removes a saved password.
    * @param {number} rowIndex indicating the row to remove.
    */
   PasswordManager.removeSavedPassword = function(rowIndex) {
       chrome.send('removeSavedPassword', [String(rowIndex)]);
   };
 
   /**
    * Removes a password exception.
    * @param {number} rowIndex indicating the row to remove.
    */
   PasswordManager.removePasswordException = function(rowIndex) {
       chrome.send('removePasswordException', [String(rowIndex)]);
   };
 
   PasswordManager.requestShowPassword = function(index) {
     chrome.send('requestShowPassword', [index]);
   };
 
   // Forward public APIs to private implementations on the singleton instance.
   cr.makePublic(PasswordManager, [
     'setSavedPasswordsList',
     'setPasswordExceptionsList',
-    'showPassword',
-    'originValidityCheckComplete'
+    'showPassword'
   ]);
 
   // Export
   return {
     PasswordManager: PasswordManager
   };
 
 });