Add 2-lines summary to CC/Address for Wallet items.

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 <string>
 
 #include "base/bind.h"
@@ skipping 42 matching lines @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/webkit_resources.h"
 #include "net/base/cert_status_flags.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/skbitmap_operations.h"
 
+#if defined(OS_ANDROID)
+  #define ENABLE_TWO_LINE_SUGGESTIONS 1
+#endif  // defined(OS_ANDROID)
+
 namespace autofill {
 
 namespace {
 
 const bool kPayWithoutWalletDefault = false;
 
 // Returns true if |input| should be shown when |field| has been requested.
 bool InputTypeMatchesFieldType(const DetailInput& input,
                                const AutofillField& field) {
   // If any credit card expiration info is asked for, show both month and year
@@ skipping 1099 matching lines @@
   suggested_cc_billing_.Reset();
   suggested_shipping_.Reset();
 
   if (IsPayingWithWallet()) {
     if (wallet_items_.get()) {
       // TODO(estade): seems we need to hardcode the email address.
 
       const std::vector<wallet::Address*>& addresses =
           wallet_items_->addresses();
       for (size_t i = 0; i < addresses.size(); ++i) {
+#if ENABLE_TWO_LINE_SUGGESTIONS
+        suggested_shipping_.AddKeyedItemWithSublabel(
+            base::IntToString(i),
+            addresses[i]->DisplaySummaryLine1(),
+            addresses[i]->DisplaySummaryLine2());
+#else
         suggested_shipping_.AddKeyedItem(base::IntToString(i),
                                          addresses[i]->DisplayName());
+#endif
       }
 
       const std::vector<wallet::WalletItems::MaskedInstrument*>& instruments =
           wallet_items_->instruments();
       for (size_t i = 0; i < instruments.size(); ++i) {
+#if ENABLE_TWO_LINE_SUGGESTIONS
+        // TODO(aruslan): improve this stub implementation.
+        suggested_cc_billing_.AddKeyedItemWithSublabelAndIcon(
+            base::IntToString(i),
+            instruments[i]->DisplaySummaryLine1(),
+            instruments[i]->DisplaySummaryLine2(),
+            instruments[i]->CardIcon());
+#else
         suggested_cc_billing_.AddKeyedItemWithIcon(
             base::IntToString(i),
             instruments[i]->descriptive_name(),
             instruments[i]->CardIcon());
+#endif
       }
     }
 
     suggested_cc_billing_.AddKeyedItem(
         std::string(),
         l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_ADD_BILLING_DETAILS));
   } else {
     PersonalDataManager* manager = GetManager();
     const std::vector<CreditCard*>& cards = manager->credit_cards();
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
@@ skipping 228 matching lines @@
   // If the user is editing or inputting data, ask the view.
   if (item_key.empty() || section_editing_state_[SECTION_SHIPPING])
     return view_->UseBillingForShipping();
 
   // Otherwise, the checkbox should be hidden so its state is irrelevant.
   // Always use the shipping suggestion model.
   return false;
 }
 
 }  // namespace autofill