rAc: When filling partial autofill data, don't fill across dialog sections.

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 2133 matching lines @@
                                 &popup_icons);
   }
 
   if (popup_values.empty()) {
     HidePopup();
     return;
   }
 
   // |popup_input_type_| must be set before calling |Show()|.
   popup_input_type_ = type;
+  popup_section_ = section;
 
   // TODO(estade): do we need separators and control rows like 'Clear
   // Form'?
   std::vector<int> popup_ids;
   for (size_t i = 0; i < popup_values.size(); ++i) {
     popup_ids.push_back(i);
   }
 
   popup_controller_ = AutofillPopupControllerImpl::GetOrCreate(
       popup_controller_,
@@ skipping 251 matching lines @@
         &i18n_validator_suggestions_[identifier - popup_guids_.size()]));
   }
 
   // If the user hasn't switched away from the default country and |wrapper|'s
   // country differs from the |view_|'s, rebuild inputs and restore user data.
   const FieldValueMap snapshot = TakeUserInputSnapshot();
   bool billing_rebuilt = false, shipping_rebuilt = false;
 
   base::string16 billing_country =
       wrapper->GetInfo(AutofillType(ADDRESS_BILLING_COUNTRY));
-  if (!snapshot.count(ADDRESS_BILLING_COUNTRY) &&
+  if (popup_section_ == ActiveBillingSection() &&
+      !snapshot.count(ADDRESS_BILLING_COUNTRY) &&
       !billing_country.empty()) {
     billing_rebuilt = RebuildInputsForCountry(
         ActiveBillingSection(), billing_country, false);
   }
 
   base::string16 shipping_country =
       wrapper->GetInfo(AutofillType(ADDRESS_HOME_COUNTRY));
-  if (!snapshot.count(ADDRESS_HOME_COUNTRY) &&
+  if (popup_section_ == SECTION_SHIPPING &&
+      !snapshot.count(ADDRESS_HOME_COUNTRY) &&
       !shipping_country.empty()) {
     shipping_rebuilt = RebuildInputsForCountry(
         SECTION_SHIPPING, shipping_country, false);
   }
 
   if (billing_rebuilt || shipping_rebuilt) {
     RestoreUserInputFromSnapshot(snapshot);
     if (billing_rebuilt)
       UpdateSection(ActiveBillingSection());
     if (shipping_rebuilt)
       UpdateSection(SECTION_SHIPPING);
   }
 
-  for (size_t i = SECTION_MIN; i <= SECTION_MAX; ++i) {
-    DialogSection section = static_cast<DialogSection>(i);
-    if (!SectionIsActive(section))
-      continue;
-
-    wrapper->FillInputs(MutableRequestedFieldsForSection(section));
-    view_->FillSection(section, popup_input_type);
-  }
+  DCHECK(SectionIsActive(popup_section_));
+  wrapper->FillInputs(MutableRequestedFieldsForSection(popup_section_));
+  view_->FillSection(popup_section_, popup_input_type);
 
   GetMetricLogger().LogDialogPopupEvent(
       AutofillMetrics::DIALOG_POPUP_FORM_FILLED);
 
   // TODO(estade): not sure why it's necessary to do this explicitly.
   HidePopup();
 }
 
 void AutofillDialogControllerImpl::RemoveSuggestion(
     const base::string16& value,
@@ skipping 336 matching lines @@
       wallet_client_(profile_->GetRequestContext(), this, source_url),
       wallet_items_requested_(false),
       handling_use_wallet_link_click_(false),
       passive_failed_(false),
       suggested_cc_(this),
       suggested_billing_(this),
       suggested_cc_billing_(this),
       suggested_shipping_(this),
       cares_about_shipping_(true),
       popup_input_type_(UNKNOWN_TYPE),
+      popup_section_(SECTION_MIN),
       waiting_for_explicit_sign_in_response_(false),
       has_accepted_legal_documents_(false),
       is_submitting_(false),
       choose_another_instrument_or_address_(false),
       wallet_server_validation_recoverable_(true),
       data_was_passed_back_(false),
       was_ui_latency_logged_(false),
       card_generated_animation_(2000, 60, this),
       weak_ptr_factory_(this) {
   DCHECK(!callback_.is_null());
@@ skipping 1307 matching lines @@
   view_->UpdateButtonStrip();
 }
 
 void AutofillDialogControllerImpl::FetchWalletCookie() {
   net::URLRequestContextGetter* request_context = profile_->GetRequestContext();
   signin_helper_.reset(new wallet::WalletSigninHelper(this, request_context));
   signin_helper_->StartWalletCookieValueFetch();
 }
 
 }  // namespace autofill