[rAc] Reset the user's selection to the new default when the default Wallet item changes.

chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 824 matching lines @@
          !wallet_items_->instruments().empty() &&
          !wallet_items_->addresses().empty();
 }
 
 bool AutofillDialogControllerImpl::IsSubmitPausedOn(
     wallet::RequiredAction required_action) const {
   return full_wallet_ && full_wallet_->HasRequiredAction(required_action);
 }
 
 void AutofillDialogControllerImpl::GetWalletItems() {
-  DCHECK(previously_selected_instrument_id_.empty());
-  DCHECK(previously_selected_shipping_address_id_.empty());
   ScopedViewUpdates updates(view_.get());
 
+  previously_selected_instrument_id_.clear();
+  previously_selected_shipping_address_id_.clear();
   if (wallet_items_) {
-    if (ActiveInstrument())
-      previously_selected_instrument_id_ = ActiveInstrument()->object_id();
+    previous_default_instrument_id_ = wallet_items_->default_instrument_id();
+    previous_default_shipping_address_id_ = wallet_items_->default_address_id();
+
+    const wallet::WalletItems::MaskedInstrument* instrument =
+        ActiveInstrument();
+    if (instrument)
+      previously_selected_instrument_id_ = instrument->object_id();
 
     const wallet::Address* address = ActiveShippingAddress();
     if (address)
       previously_selected_shipping_address_id_ = address->object_id();
   }
 
   last_wallet_items_fetch_timestamp_ = base::TimeTicks::Now();
   wallet_items_.reset();
 
   // The "Loading..." page should be showing now, which should cause the
@@ skipping 1508 matching lines @@
       kSameAsBillingKey,
       l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_USE_BILLING_FOR_SHIPPING));
 
   if (IsPayingWithWallet()) {
     if (!account_chooser_model_.active_wallet_account_name().empty()) {
       suggested_email_.AddKeyedItem(
           base::IntToString(0),
           account_chooser_model_.active_wallet_account_name());
     }
 
+    // If the default address changed since the last fetch of the Wallet data,
+    // select it rather than the previously selected address, as the user's
+    // intention in changing the default address was probably to use it.
+    if (previous_default_shipping_address_id_ !=
+            wallet_items_->default_address_id()) {
+      previously_selected_shipping_address_id_.clear();
+    }
+
     const std::vector<wallet::Address*>& addresses =
         wallet_items_->addresses();
     for (size_t i = 0; i < addresses.size(); ++i) {
       std::string key = base::IntToString(i);
       suggested_shipping_.AddKeyedItemWithSublabel(
           key,
           addresses[i]->DisplayName(),
           addresses[i]->DisplayNameDetail());
 
       const std::string default_shipping_address_id =
           !previously_selected_shipping_address_id_.empty() ?
               previously_selected_shipping_address_id_ :
               wallet_items_->default_address_id();
       if (addresses[i]->object_id() == default_shipping_address_id)
         suggested_shipping_.SetCheckedItem(key);
     }
     previously_selected_shipping_address_id_.clear();
 
     if (!IsSubmitPausedOn(wallet::VERIFY_CVV)) {
+      // If the default address changed since the last fetch of the Wallet data,
+      // select it rather than the previously selected address, as the user's
+      // intention in changing the default address was probably to use it.
+      if (previous_default_instrument_id_ !=
+              wallet_items_->default_instrument_id()) {
+        previously_selected_instrument_id_.clear();

[Evan Stade, 2013/09/04 19:25:28]

can you keep all this default instrument logic in one place? i.e. move the
default_instrument_id logic up here

(same for the default shipping id stuff)

[Ilya Sherman, 2013/09/05 01:13:59]

Done.

+      }
+
       const std::vector<wallet::WalletItems::MaskedInstrument*>& instruments =
           wallet_items_->instruments();
       std::string first_active_instrument_key;
       std::string default_instrument_key;
       for (size_t i = 0; i < instruments.size(); ++i) {
         bool allowed = IsInstrumentAllowed(*instruments[i]);
         gfx::Image icon = instruments[i]->CardIcon();
         if (!allowed && !icon.IsEmpty()) {
           // Create a grayed disabled icon.
           SkBitmap disabled_bitmap = SkBitmapOperations::CreateHSLShiftedBitmap(
@@ skipping 14 matching lines @@
             first_active_instrument_key = key;
 
           const std::string default_instrument_id =
               !previously_selected_instrument_id_.empty() ?
                   previously_selected_instrument_id_ :
                   wallet_items_->default_instrument_id();
           if (instruments[i]->object_id() == default_instrument_id)
             default_instrument_key = key;
         }
       }
       previously_selected_instrument_id_.clear();

[Evan Stade, 2013/09/04 19:25:28]

do we still need this here?

[Ilya Sherman, 2013/09/05 01:13:59]

Done.

 
       // TODO(estade): this should have a URL sublabel.
       suggested_cc_billing_.AddKeyedItem(
           kAddNewItemKey,
           l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADD_BILLING_DETAILS));
       if (!wallet_items_->HasRequiredAction(wallet::SETUP_WALLET)) {
         suggested_cc_billing_.AddKeyedItemWithSublabel(
             kManageItemsKey,
             l10n_util::GetStringUTF16(
                 IDS_AUTOFILL_DIALOG_MANAGE_BILLING_DETAILS),
@@ skipping 885 matching lines @@
   }
 #if !defined(OS_ANDROID)
   GeneratedCreditCardBubbleController::Show(
       web_contents(),
       full_wallet_->TypeAndLastFourDigits(),
       backing_last_four);
 #endif
 }
 
 }  // namespace autofill