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

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

 // 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.
 
 #include "chrome/browser/ui/views/autofill/autofill_dialog_views.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
@@ skipping 484 matching lines @@
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
 }
 
 AutofillDialogViews::SuggestionView::~SuggestionView() {}
 
 void AutofillDialogViews::SuggestionView::SetEditable(bool editable) {
   edit_link_->SetVisible(editable);
 }
 
 void AutofillDialogViews::SuggestionView::SetSuggestionText(
-    const string16& text,
-    gfx::Font::FontStyle text_style) {
-  label_->SetFont(ui::ResourceBundle::GetSharedInstance().GetFont(
-      ui::ResourceBundle::BaseFont).DeriveFont(0, text_style));
-
+    const string16& text) {
   // TODO(estade): does this localize well?
   string16 line_return(ASCIIToUTF16("\n"));
   size_t position = text.find(line_return);
   if (position == string16::npos) {
     label_->SetText(text);
     label_line_2_->SetVisible(false);
   } else {
     label_->SetText(text.substr(0, position));
     label_line_2_->SetText(text.substr(position + line_return.length()));
     label_line_2_->SetVisible(true);
@@ skipping 34 matching lines @@
   return new AutofillDialogViews(controller);
 }
 
 // AutofillDialogViews ---------------------------------------------------------
 
 AutofillDialogViews::AutofillDialogViews(AutofillDialogController* controller)
     : controller_(controller),
       window_(NULL),
       contents_(NULL),
       notification_area_(NULL),
+      use_billing_for_shipping_(NULL),
       account_chooser_(NULL),
       sign_in_container_(NULL),
       cancel_sign_in_(NULL),
       sign_in_webview_(NULL),
       main_container_(NULL),
       details_container_(NULL),
       button_strip_extra_view_(NULL),
       save_in_chrome_checkbox_(NULL),
       autocheckout_progress_bar_view_(NULL),
       autocheckout_progress_bar_(NULL),
@@ skipping 131 matching lines @@
   }
 }
 
 string16 AutofillDialogViews::GetCvc() {
   DialogSection billing_section = controller_->SectionIsActive(SECTION_CC) ?
       SECTION_CC : SECTION_CC_BILLING;
   return GroupForSection(billing_section)->suggested_info->
       decorated_textfield()->textfield()->text();
 }
 
+bool AutofillDialogViews::UseBillingForShipping() {
+  return use_billing_for_shipping_->checked();
+}
+
 bool AutofillDialogViews::SaveDetailsLocally() {
   return save_in_chrome_checkbox_->checked();
 }
 
 const content::NavigationController* AutofillDialogViews::ShowSignIn() {
   // TODO(abodenha) We should be able to use the WebContents of the WebView
   // to navigate instead of LoadInitialURL.  Figure out why it doesn't work.
 
   account_chooser_->SetSignInLinkEnabled(false);
   sign_in_webview_->LoadInitialURL(wallet::GetSignInUrl());
@@ skipping 95 matching lines @@
                            kLegalDocPadding,
                            kLegalDocPadding,
                            0));
   footnote_view_->set_border(
       views::Border::CreateSolidSidedBorder(1, 0, 0, 0, kSubtleBorderColor));
   footnote_view_->set_background(
       views::Background::CreateSolidBackground(kShadingColor));
 
   legal_document_view_ = new views::StyledLabel(string16(), this);
   footnote_view_->AddChildView(legal_document_view_);
-  UpdateAccountChooser();
 
   return footnote_view_;
 }
 
 bool AutofillDialogViews::Cancel() {
   controller_->OnCancel();
   return true;
 }
 
 bool AutofillDialogViews::Accept() {
   if (ValidateForm())
     controller_->OnAccept();
 
   // |controller_| decides when to hide the dialog.
   return false;
 }
 
 // TODO(wittman): Remove this override once we move to the new style frame view
 // on all dialogs.
 views::NonClientFrameView* AutofillDialogViews::CreateNonClientFrameView(
     views::Widget* widget) {
   return CreateConstrainedStyleNonClientFrameView(
       widget,
       controller_->web_contents()->GetBrowserContext());
 }
 
 void AutofillDialogViews::ButtonPressed(views::Button* sender,
                                         const ui::Event& event) {
-  if (sender == cancel_sign_in_) {
+  if (sender == use_billing_for_shipping_) {
+    UpdateDetailsGroupState(*GroupForSection(SECTION_SHIPPING));
+  } else if (sender == cancel_sign_in_) {
     controller_->EndSignInFlow();
   } else {
     // TODO(estade): Should the menu be shown on mouse down?
     DetailsGroup* group = NULL;
     for (DetailGroupMap::iterator iter = detail_groups_.begin();
          iter != detail_groups_.end(); ++iter) {
       if (sender == iter->second.suggested_button) {
         group = &iter->second;
         break;
       }
@@ skipping 193 matching lines @@
                         0,
                         0);
   layout->StartRow(0, kColumnSetId);
 
   // The |info_view| holds |manual_inputs| and |suggested_info|, allowing the
   // dialog to toggle which is shown.
   views::View* info_view = new views::View();
   info_view->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
 
+  if (section == SECTION_SHIPPING) {
+    use_billing_for_shipping_ =
+        new views::Checkbox(controller_->UseBillingForShippingText());
+    use_billing_for_shipping_->SetChecked(true);
+    use_billing_for_shipping_->set_listener(this);
+    info_view->AddChildView(use_billing_for_shipping_);
+  }
+
   views::View* manual_inputs = InitInputsView(section);
   info_view->AddChildView(manual_inputs);
   SuggestionView* suggested_info =
       new SuggestionView(controller_->EditSuggestionText(), this);
   info_view->AddChildView(suggested_info);
   layout->AddView(info_view);
 
   // TODO(estade): Fix the appearance of this button.
   views::ImageButton* menu_button = new views::ImageButton(this);
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
@@ skipping 83 matching lines @@
   }
 
   return view;
 }
 
 void AutofillDialogViews::UpdateDetailsGroupState(const DetailsGroup& group) {
   const SuggestionState& suggestion_state =
       controller_->SuggestionStateForSection(group.section);
   bool show_suggestions = !suggestion_state.text.empty();
   group.suggested_info->SetVisible(show_suggestions);
-  group.suggested_info->SetSuggestionText(suggestion_state.text,
-                                          suggestion_state.text_style);
+  group.suggested_info->SetSuggestionText(suggestion_state.text);
   group.suggested_info->SetSuggestionIcon(suggestion_state.icon);
   group.suggested_info->SetEditable(suggestion_state.editable);
 
   if (!suggestion_state.extra_text.empty()) {
     group.suggested_info->ShowTextfield(
         suggestion_state.extra_text,
         suggestion_state.extra_icon.AsImageSkia());
   }
 
-  group.manual_input->SetVisible(!show_suggestions);
+  if (group.section == SECTION_SHIPPING) {
+    bool show_checkbox = !show_suggestions;
+    // When the checkbox is going from hidden to visible, it's because the
+    // user clicked "Enter new address". Reset the checkbox to unchecked in this
+    // case.
+    if (show_checkbox && !use_billing_for_shipping_->visible())
+      use_billing_for_shipping_->SetChecked(false);
+
+    use_billing_for_shipping_->SetVisible(show_checkbox);
+    group.manual_input->SetVisible(
+        show_checkbox && !use_billing_for_shipping_->checked());
+  } else {
+    group.manual_input->SetVisible(!show_suggestions);
+  }
 
   // Show or hide the "Save in chrome" checkbox. If nothing is in editing mode,
   // hide. If the controller tells us not to show it, likewise hide.
   save_in_chrome_checkbox_->SetVisible(
       controller_->ShouldOfferToSaveInChrome());
 
   const bool has_suggestions =
       controller_->MenuModelForSection(group.section)->GetItemCount() > 0;
 
   if (group.suggested_button)
@@ skipping 168 matching lines @@
 AutofillDialogViews::DetailsGroup::DetailsGroup(DialogSection section)
     : section(section),
       container(NULL),
       manual_input(NULL),
       suggested_info(NULL),
       suggested_button(NULL) {}
 
 AutofillDialogViews::DetailsGroup::~DetailsGroup() {}
 
 }  // namespace autofill