Revert 195316 "Remove "Use billing for shipping" checkbox in fav..."

trunk/src/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h

Index: trunk/src/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
===================================================================
--- trunk/src/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h	(revision 195318)
+++ trunk/src/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h	(working copy)
@@ -96,6 +96,7 @@
   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 +166,8 @@
                        const content::NotificationDetails& details) OVERRIDE;
 
   // SuggestionsMenuModelDelegate implementation.
-  virtual void SuggestionItemSelected(SuggestionsMenuModel* model,
-                                      size_t index) OVERRIDE;
+  virtual void SuggestionItemSelected(const SuggestionsMenuModel& model)
+      OVERRIDE;
 
   // wallet::WalletClientDelegate implementation.
   virtual const AutofillMetrics& GetMetricLogger() const OVERRIDE;
@@ -325,8 +326,6 @@
   // 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;
@@ -373,10 +372,6 @@
   // 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();