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 adfaccb1d8a3ff0fdbcd575b3de32f41faccb768..b197214725fd032c87c695f6caef32337c3b52c5 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;
@@ -165,8 +164,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;
@@ -323,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;

[Dan Beam, 2013/04/16 03:01:14]

opt. nit: I think there's something in the style guide about trying not to add
trailing `const`s on the next line, i.e. you'd wrap like:

  gfx::Font::FontStyle SuggestionTextStyleForSection(
      DialogSection section) const;

think I saw it fly past on a review... but can't procure evidence.

[Evan Stade, 2013/04/16 19:06:20]

that rule was removed from the style guide.

   string16 RequiredActionTextForSection(DialogSection section) const;
   gfx::Image SuggestionIconForSection(DialogSection section);
   string16 ExtraSuggestionTextForSection(DialogSection section) const;
@@ -369,6 +370,10 @@ class AutofillDialogControllerImpl : public AutofillDialogController,
   // the dialog have valid contents.
   bool SectionIsValid(DialogSection section) const;
 
+  // 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();