Implement newly saved card bubble for realz and update generated card bubble to

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 3429 matching lines @@
   return has_autofill_profiles ?
       AutofillMetrics::DIALOG_USER_SIGNED_IN_HAS_WALLET_HAS_AUTOFILL :
       AutofillMetrics::DIALOG_USER_SIGNED_IN_HAS_WALLET_NO_AUTOFILL;
 }
 
 void AutofillDialogControllerImpl::MaybeShowCreditCardBubble() {
   if (!data_was_passed_back_)
     return;
 
   if (newly_saved_card_) {
+    scoped_ptr<AutofillProfile> billing_profile;
+
+    SuggestionsMenuModel* billing_model =
+        SuggestionsMenuModelForSection(SECTION_BILLING);
+    std::string item_key = billing_model->GetItemKeyForCheckedItem();
+    if (IsASuggestionItemKey(item_key) &&
+        !IsManuallyEditingSection(SECTION_BILLING)) {
+      // Just snag the currently suggested profile.
+      AutofillProfile* profile = GetManager()->GetProfileByGUID(item_key);
+      billing_profile.reset(new AutofillProfile(*profile));
+    } else {
+      // Scrape the view as the user's entering or updating information.
+      DetailOutputMap outputs;
+      view_->GetUserInput(SECTION_BILLING, &outputs);
+      billing_profile.reset(new AutofillProfile);
+      FillFormGroupFromOutputs(outputs, billing_profile.get());
+    }
+
+    // The bubble also needs the associated email address.
+    billing_profile->SetRawInfo(
+        EMAIL_ADDRESS,
+        GetValueFromSection(SECTION_EMAIL, EMAIL_ADDRESS));
+
     AutofillCreditCardBubbleController::ShowNewCardSavedBubble(
-        web_contents(), newly_saved_card_->TypeAndLastFourDigits());
+        web_contents(), newly_saved_card_.Pass(), billing_profile.Pass());
     return;
   }
 
   if (!full_wallet_ || !full_wallet_->billing_address())
     return;
 
   // Don't show GeneratedCardBubble if Autocheckout failed.
   if (GetDialogType() == DIALOG_TYPE_AUTOCHECKOUT &&
       autocheckout_state_ != AUTOCHECKOUT_SUCCESS) {
     return;
   }
 
   base::string16 backing_last_four;
   if (ActiveInstrument()) {
     backing_last_four = ActiveInstrument()->TypeAndLastFourDigits();
   } else {
     DetailOutputMap output;
     view_->GetUserInput(SECTION_CC_BILLING, &output);
     CreditCard card;
     GetBillingInfoFromOutputs(output, &card, NULL, NULL);
     backing_last_four = card.TypeAndLastFourDigits();
   }
-  AutofillCreditCardBubbleController::ShowGeneratedCardUI(
+  AutofillCreditCardBubbleController::ShowGeneratedCardBubble(
       web_contents(), backing_last_four, full_wallet_->TypeAndLastFourDigits());
 }
 
 }  // namespace autofill