rAc - hardcode wallet billing address to US in i18n mode

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 1147 matching lines @@
 
   if (i18ninput::Enabled()) {
     CountryComboboxModel* model = CountryComboboxModelForSection(section);
     if (model) {
       base::string16 country = model->GetItemAt(model->GetDefaultIndex());
       RebuildInputsForCountry(section, country, false);
     }
   }
 
   DetailInputs* inputs = MutableRequestedFieldsForSection(section);
-  for (DetailInputs::iterator it = inputs->begin(); it != inputs->end(); ++it) {
-    it->initial_value = common::GetHardcodedValueForType(it->type);
+  for (DetailInputs::iterator it = inputs->begin();
+       it != inputs->end(); ++it) {
+    if (it->length != DetailInput::NONE)
+      it->initial_value = common::GetHardcodedValueForType(it->type);
   }
 }
 
 void AutofillDialogControllerImpl::ShowEditUiIfBadSuggestion(
     DialogSection section) {
   // |CreateWrapper()| returns an empty wrapper if |IsEditingExistingData()|, so
   // get the wrapper before this potentially happens below.
   scoped_ptr<DataModelWrapper> wrapper = CreateWrapper(section);
 
   // If the chosen item in |model| yields an empty suggestion text, it is
@@ skipping 63 matching lines @@
     return;
 
   for (size_t i = SECTION_MIN; i <= SECTION_MAX; ++i) {
     DialogSection section = static_cast<DialogSection>(i);
     if (!SectionIsActive(section))
       continue;
 
     DetailInputs* inputs = MutableRequestedFieldsForSection(section);
     for (size_t i = 0; i < inputs->size(); ++i) {
       DetailInput* input = &(*inputs)[i];
-      input->initial_value =
-          GetInfoFromInputs(snapshot, section, AutofillType(input->type));
+      if (input->length != DetailInput::NONE) {
+        input->initial_value =
+            GetInfoFromInputs(snapshot, section, AutofillType(input->type));
+      }
       if (InputWasEdited(input->type, input->initial_value))
         SuggestionsMenuModelForSection(section)->SetCheckedItem(kAddNewItemKey);
     }
   }
 }
 
 void AutofillDialogControllerImpl::UpdateSection(DialogSection section) {
   if (view_)
     view_->UpdateSection(section);
 }
@@ skipping 1729 matching lines @@
   if (view_)
     view_->ModelChanged();
 
   for (size_t i = SECTION_MIN; i <= SECTION_MAX; ++i) {
     ResetSectionInput(static_cast<DialogSection>(i));
   }
 
   FieldValueMap::const_iterator billing_it =
       snapshot.find(ADDRESS_BILLING_COUNTRY);
   if (billing_it != snapshot.end())
-    RebuildInputsForCountry(ActiveBillingSection(), billing_it->second, false);
+    RebuildInputsForCountry(ActiveBillingSection(), billing_it->second, true);
 
   FieldValueMap::const_iterator shipping_it =
       snapshot.find(ADDRESS_HOME_COUNTRY);
   if (shipping_it != snapshot.end())
-    RebuildInputsForCountry(SECTION_SHIPPING, shipping_it->second, false);
+    RebuildInputsForCountry(SECTION_SHIPPING, shipping_it->second, true);
 
   RestoreUserInputFromSnapshot(snapshot);
 
   for (size_t i = SECTION_MIN; i <= SECTION_MAX; ++i) {
     DialogSection section = static_cast<DialogSection>(i);
     if (!SectionIsActive(section))
       continue;
 
     ShowEditUiIfBadSuggestion(section);
     UpdateSection(section);
@@ skipping 153 matching lines @@
 
   if (&model == &suggested_cc_billing_)
     return SECTION_CC_BILLING;
 
   DCHECK_EQ(&model, &suggested_shipping_);
   return SECTION_SHIPPING;
 }
 
 CountryComboboxModel* AutofillDialogControllerImpl::
     CountryComboboxModelForSection(DialogSection section) {
-  if (section == SECTION_BILLING || section == SECTION_CC_BILLING)
+  if (section == SECTION_BILLING)
     return &billing_country_combobox_model_;
 
   if (section == SECTION_SHIPPING)
     return &shipping_country_combobox_model_;
 
   return NULL;
 }
 
 DetailInputs* AutofillDialogControllerImpl::MutableRequestedFieldsForSection(
     DialogSection section) {
@@ skipping 616 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