Autofill settings - Fix editing of local addresses and credit cards.

chrome/browser/resources/options/autofill_options_list.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.
 
 /**
  * @typedef {{
  *   guid: string,
  *   label: string,
  *   sublabel: string,
  *   isLocal: boolean,
@@ skipping 72 matching lines @@
       sublabel.className = 'deemphasized';
       sublabel.textContent = this.metadata_.sublabel;
       this.contentElement.appendChild(sublabel);
 
       if (!this.metadata_.isLocal) {
         this.deletable = false;
         this.contentElement.appendChild(CreateGoogleAccountLabel());
       }
 
       // The 'Edit' button.
-      var guid = this.metadata_.guid;
+      var metadata = this.metadata_;
       var editButtonEl = AutofillEditProfileButton(
-          function() { AutofillOptions.loadAddressEditor(guid); });
+          AddressListItem.prototype.loadAddressEditor.bind(this));
       this.contentElement.appendChild(editButtonEl);
     },
+
+    /**
+     * For local Autofill data, this function causes the AutofillOptionsHandler
+     * to call showEditAddressOverlay(). For Wallet data, the user is
+     * redirected to the Wallet web interface.
+     */
+    loadAddressEditor: function() {
+      if (this.metadata_.isLocal)
+        chrome.send('loadAddressEditor', [this.metadata_.guid]);
+      else
+        window.open(loadTimeData.getString('manageWalletAddressesUrl'));
+    },
   };
 
   /**
    * Creates a new credit card list item.
    * @param {AutofillEntityMetadata} metadata Details about a credit card.
    * @constructor
    * @extends {options.DeletableItem}
    */
   function CreditCardListItem(metadata) {
     var el = cr.doc.createElement('div');
@@ skipping 36 matching lines @@
         this.contentElement.appendChild(localCopyText);
 
         var clearLocalCopyButton = AutofillEditProfileButton(
             function() { chrome.send('clearLocalCardCopy', [guid]); });
         clearLocalCopyButton.textContent =
             loadTimeData.getString('autofillClearLocalCopyButton');
         this.contentElement.appendChild(clearLocalCopyButton);
       }
 
       // The 'Edit' button.
+      var metadata = this.metadata_;
       var editButtonEl = AutofillEditProfileButton(
-          function() { AutofillOptions.loadCreditCardEditor(guid); });
+          CreditCardListItem.prototype.loadCreditCardEditor.bind(this));
       this.contentElement.appendChild(editButtonEl);
     },
+
+    /**
+     * For local Autofill data, this function causes the AutofillOptionsHandler
+     * to call showEditCreditCardOverlay(). For Wallet data, the user is
+     * redirected to the Wallet web interface.
+     */
+    loadCreditCardEditor: function() {
+      if (this.metadata_.isLocal)
+        chrome.send('loadCreditCardEditor', [this.metadata_.guid]);
+      else
+        window.open(loadTimeData.getString('manageWalletPaymentMethodsUrl'));
+    },
   };
 
   /**
    * Creates a new value list item.
    * @param {options.autofillOptions.AutofillValuesList} list The parent list of
    *     this item.
    * @param {string} entry A string value.
    * @constructor
    * @extends {options.InlineEditableItem}
    */
@@ skipping 233 matching lines @@
 
   AutofillAddressList.prototype = {
     __proto__: AutofillProfileList.prototype,
 
     decorate: function() {
       AutofillProfileList.prototype.decorate.call(this);
     },
 
     /** @override */
     activateItemAtIndex: function(index) {
-      AutofillOptions.loadAddressEditor(this.dataModel.item(index));
+      this.getListItemByIndex(index).loadAddressEditor();
     },
 
     /**
      * @override
      * @param {AutofillEntityMetadata} metadata
      */
     createItem: function(metadata) {
       return new AddressListItem(metadata);
     },
 
@@ skipping 13 matching lines @@
 
   AutofillCreditCardList.prototype = {
     __proto__: AutofillProfileList.prototype,
 
     decorate: function() {
       AutofillProfileList.prototype.decorate.call(this);
     },
 
     /** @override */
     activateItemAtIndex: function(index) {
-      AutofillOptions.loadCreditCardEditor(this.dataModel.item(index));
+      this.getListItemByIndex(index).loadCreditCardEditor();
     },
 
     /**
      * @override
      * @param {AutofillEntityMetadata} metadata
      */
     createItem: function(metadata) {
       return new CreditCardListItem(metadata);
     },
 
@@ skipping 137 matching lines @@
     CreditCardListItem: CreditCardListItem,
     ValuesListItem: ValuesListItem,
     NameListItem: NameListItem,
     AutofillAddressList: AutofillAddressList,
     AutofillCreditCardList: AutofillCreditCardList,
     AutofillValuesList: AutofillValuesList,
     AutofillNameValuesList: AutofillNameValuesList,
     AutofillPhoneValuesList: AutofillPhoneValuesList,
   };
 });