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 642 matching lines @@
       current_url.GetOrigin() == source_url_.GetOrigin();
 
   if (!invoked_from_same_origin_) {
     GetMetricLogger().LogDialogSecurityMetric(
         AutofillMetrics::SECURITY_METRIC_CROSS_ORIGIN_FRAME);
   }
 
   for (size_t i = SECTION_MIN; i <= SECTION_MAX; ++i) {
     DialogSection section = static_cast<DialogSection>(i);
 
-    std::string country_code;
+    std::string country_code = "US";
     CountryComboboxModel* model = CountryComboboxModelForSection(section);
     if (model)
       country_code = model->GetDefaultCountryCode();
 
     DetailInputs* inputs = MutableRequestedFieldsForSection(section);
     common::BuildInputsForSection(section, country_code, inputs);
   }
 
   // Test whether we need to show the shipping section. If filling that section
   // would be a no-op, don't show it.
@@ skipping 480 matching lines @@
 
 void AutofillDialogControllerImpl::ResetSectionInput(DialogSection section) {
   SetEditingExistingData(section, false);
 
   if (i18ninput::Enabled()) {
     CountryComboboxModel* model = CountryComboboxModelForSection(section);
     if (model) {
       base::string16 country = model->GetItemAt(model->GetDefaultIndex());
       RebuildInputsForCountry(section, country, false);
     }
   }

[Dan Beam, 2014/02/07 01:30:44]

} else {

[Evan Stade, 2014/02/08 02:30:13]

Done.

 
   DetailInputs* inputs = MutableRequestedFieldsForSection(section);
   for (DetailInputs::iterator it = inputs->begin(); it != inputs->end(); ++it) {
-    it->initial_value = common::GetHardcodedValueForType(it->type);
+    if (!i18ninput::Enabled())

[Dan Beam, 2014/02/07 01:30:44]

^ remove

[Evan Stade, 2014/02/08 02:30:13]

Done.

+      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 1988 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 596 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