Remove "Use billing for shipping" checkbox in favor of item in suggestions menu.

chrome/browser/ui/autofill/autofill_dialog_controller_impl.h

Index: chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
index d6f7a5aa72309ca4ab0dc7713a8cce083ddb226c..299d34a396f16f59e604dcd12fed64fa6421dae6 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
@@ -95,7 +95,6 @@ class AutofillDialogControllerImpl : public AutofillDialogController,
   virtual string16 AccountChooserText() const OVERRIDE;
   virtual string16 SignInLinkText() const OVERRIDE;
   virtual string16 EditSuggestionText() const OVERRIDE;
-  virtual string16 UseBillingForShippingText() const OVERRIDE;
   virtual string16 CancelButtonText() const OVERRIDE;
   virtual string16 ConfirmButtonText() const OVERRIDE;
   virtual string16 SaveLocallyText() const OVERRIDE;
@@ -164,8 +163,8 @@ class AutofillDialogControllerImpl : public AutofillDialogController,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // SuggestionsMenuModelDelegate implementation.
-  virtual void SuggestionItemSelected(const SuggestionsMenuModel& model)
-      OVERRIDE;
+  virtual void SuggestionItemSelected(SuggestionsMenuModel* model,
+                                      const std::string& item_key) OVERRIDE;
 
   // wallet::WalletClientDelegate implementation.
   virtual const AutofillMetrics& GetMetricLogger() const OVERRIDE;
@@ -310,7 +309,10 @@ class AutofillDialogControllerImpl : public AutofillDialogController,
   void SetCvcResult(const string16& cvc);
 
   // Gets the SuggestionsMenuModel for |section|.
-  SuggestionsMenuModel* SuggestionsMenuModelForSection(DialogSection section);
+  SuggestionsMenuModel* SuggestionsMenuModelForSection(
+      DialogSection section);
+  const SuggestionsMenuModel* SuggestionsMenuModelForSection(
+      DialogSection section) const;
   // And the reverse.
   DialogSection SectionForSuggestionsMenuModel(
       const SuggestionsMenuModel& model);
@@ -320,6 +322,8 @@ class AutofillDialogControllerImpl : public AutofillDialogController,
   // part of a section is suggested but part must be manually input (e.g. during
   // a CVC challenge or when using Autofill's CC section [never stores CVC]).
   string16 SuggestionTextForSection(DialogSection section);
+  gfx::Font::FontStyle SuggestionTextStyleForSection(DialogSection section)
+      const;
   string16 RequiredActionTextForSection(DialogSection section) const;
   gfx::Image SuggestionIconForSection(DialogSection section);
   string16 ExtraSuggestionTextForSection(DialogSection section) const;
@@ -355,6 +359,10 @@ class AutofillDialogControllerImpl : public AutofillDialogController,
   // happens via choosing "Add a new X..." from a section's suggestion menu.
   bool IsManuallyEditingSection(DialogSection section);
 
+  // Returns true if |key| refers to a suggestion, as opposed to some control
+  // menu item.
+  bool IsASuggestionItemKey(const std::string& key);
+
   // Whether the billing section should be used to fill in the shipping details.
   bool ShouldUseBillingForShipping();