Autofill:requestAutocomplete: Enable prompting for complete address when instrument being used does…

chrome/browser/ui/autofill/data_model_wrapper.cc

 // 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.
 
 #include "chrome/browser/ui/autofill/data_model_wrapper.h"
 
 #include "base/callback.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
@@ skipping 144 matching lines @@
 
 WalletAddressWrapper::WalletAddressWrapper(
     const wallet::Address* address) : address_(address) {}
 
 WalletAddressWrapper::~WalletAddressWrapper() {}
 
 string16 WalletAddressWrapper::GetInfo(AutofillFieldType type) {
   return address_->GetInfo(type, g_browser_process->GetApplicationLocale());
 }
 
+string16 WalletAddressWrapper::GetDisplayText() {
+  if (!address_->is_complete_address())
+    return string16();
+
+  return DataModelWrapper::GetDisplayText();
+}
+
 // WalletInstrumentWrapper
 
 WalletInstrumentWrapper::WalletInstrumentWrapper(
     const wallet::WalletItems::MaskedInstrument* instrument)
     : instrument_(instrument) {}
 
 WalletInstrumentWrapper::~WalletInstrumentWrapper() {}
 
 string16 WalletInstrumentWrapper::GetInfo(AutofillFieldType type) {
   if (type == CREDIT_CARD_EXP_MONTH)
     return MonthComboboxModel::FormatMonth(instrument_->expiration_month());
 
   return instrument_->GetInfo(type, g_browser_process->GetApplicationLocale());
 }
 
 gfx::Image WalletInstrumentWrapper::GetIcon() {
   return instrument_->CardIcon();
 }
 
 string16 WalletInstrumentWrapper::GetDisplayText() {
   // TODO(dbeam): handle other instrument statuses? http://crbug.com/233048
-  if (instrument_->status() == wallet::WalletItems::MaskedInstrument::EXPIRED)
+  if (instrument_->status() == wallet::WalletItems::MaskedInstrument::EXPIRED ||
+      !instrument_->address().is_complete_address()) {
     return string16();
+  }
 
   // TODO(estade): descriptive_name() is user-provided. Should we use it or
   // just type + last 4 digits?
   string16 line1 = instrument_->descriptive_name();
   return line1 + ASCIIToUTF16("\n") + DataModelWrapper::GetDisplayText();
 }
 
 // FullWalletBillingWrapper
 
 FullWalletBillingWrapper::FullWalletBillingWrapper(
@@ skipping 29 matching lines @@
 }
 
 FullWalletShippingWrapper::~FullWalletShippingWrapper() {}
 
 string16 FullWalletShippingWrapper::GetInfo(AutofillFieldType type) {
   return full_wallet_->shipping_address()->GetInfo(
       type, g_browser_process->GetApplicationLocale());
 }
 
 }  // namespace autofill