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

trunk/src/chrome/browser/ui/views/autofill/autofill_dialog_views.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_AUTOFILL_AUTOFILL_DIALOG_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_AUTOFILL_AUTOFILL_DIALOG_VIEWS_H_
 
 #include <map>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 60 matching lines @@
   virtual void Show() OVERRIDE;
   virtual void Hide() OVERRIDE;
   virtual void UpdateAccountChooser() OVERRIDE;
   virtual void UpdateButtonStrip() OVERRIDE;
   virtual void UpdateNotificationArea() OVERRIDE;
   virtual void UpdateSection(DialogSection section,
                              UserInputAction action) OVERRIDE;
   virtual void GetUserInput(DialogSection section,
                             DetailOutputMap* output) OVERRIDE;
   virtual string16 GetCvc() OVERRIDE;
+  virtual bool UseBillingForShipping() OVERRIDE;
   virtual bool SaveDetailsLocally() OVERRIDE;
   virtual const content::NavigationController* ShowSignIn() OVERRIDE;
   virtual void HideSignIn() OVERRIDE;
   virtual void UpdateProgressBar(double value) OVERRIDE;
   virtual void ModelChanged() OVERRIDE;
   virtual void SubmitForTesting() OVERRIDE;
   virtual void CancelForTesting() OVERRIDE;
 
   // views::DialogDelegate implementation:
   virtual string16 GetWindowTitle() const OVERRIDE;
@@ skipping 201 matching lines @@
   class SuggestionView : public views::View {
    public:
     SuggestionView(const string16& edit_label,
                    AutofillDialogViews* autofill_dialog);
     virtual ~SuggestionView();
 
     // Whether this section is editable or not.
     void SetEditable(bool editable);
 
     // Sets the display text of the suggestion.
-    void SetSuggestionText(const string16& text, gfx::Font::FontStyle style);
+    void SetSuggestionText(const string16& text);
 
     // Sets the icon which should be displayed ahead of the text.
     void SetSuggestionIcon(const gfx::Image& image);
 
     // Shows an auxiliary textfield to the right of the suggestion icon and
     // text. This is currently only used to show a CVC field for the CC section.
     void ShowTextfield(const string16& placeholder_text,
                        const gfx::ImageSkia& icon);
 
     DecoratedTextfield* decorated_textfield() { return decorated_; }
@@ skipping 120 matching lines @@
 
   // The top-level View for the dialog. Owned by the constrained window.
   views::View* contents_;
 
   // A DialogSection-keyed map of the DetailGroup structs.
   DetailGroupMap detail_groups_;
 
   // Somewhere to show notification messages about errors, warnings, or promos.
   NotificationArea* notification_area_;
 
+  // The checkbox that controls whether to use the billing details for shipping
+  // as well.
+  views::Checkbox* use_billing_for_shipping_;
+
   // Runs the suggestion menu (triggered by each section's |suggested_button|.
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   // The view that allows the user to toggle the data source.
   AccountChooser* account_chooser_;
 
   // View to host the signin dialog and related controls.
   views::View* sign_in_container_;
 
   // LabelButton displayed during sign-in. Clicking cancels sign-in and returns
@@ skipping 32 matching lines @@
 
   // The focus manager for |window_|.
   views::FocusManager* focus_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillDialogViews);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_VIEWS_AUTOFILL_AUTOFILL_DIALOG_VIEWS_H_