Implementing VERIFY_CVV required action.

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"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
 #include "components/autofill/browser/wallet/wallet_service_url.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/combobox_model.h"
+#include "ui/base/models/menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
@@ skipping 309 matching lines @@
 AutofillDialogViews::SectionContainer::~SectionContainer() {}
 
 void AutofillDialogViews::SectionContainer::SetForwardMouseEvents(
     bool forward) {
   forward_mouse_events_ = forward;
   if (!forward)
     set_background(NULL);
 }
 
 void AutofillDialogViews::SectionContainer::SetActive(bool active) {
-  if (active == !!background())
+  bool is_active = active && proxy_button_->visible();
+  if (is_active == !!background())
     return;
 
-  set_background(active ?
+  set_background(is_active ?
       // TODO(estade): use the correct color.
       views::Background::CreateSolidBackground(SK_ColorLTGRAY):
       NULL);
   SchedulePaint();
 }
 
 void AutofillDialogViews::SectionContainer::OnMouseMoved(
     const ui::MouseEvent& event) {
   if (!forward_mouse_events_)
     return;
@@ skipping 48 matching lines @@
 // AutofilDialogViews::SuggestionView ------------------------------------------
 
 AutofillDialogViews::SuggestionView::SuggestionView(
     const string16& edit_label,
     AutofillDialogViews* autofill_dialog)
     : label_(new views::Label()),
       label_line_2_(new views::Label()),
       icon_(new views::ImageView()),
       label_container_(new views::View()),
       decorated_(
-          new DecoratedTextfield(string16(), string16(), autofill_dialog)) {
+          new DecoratedTextfield(string16(), string16(), autofill_dialog)),
+      edit_link_(new views::Link(edit_label)) {
   // Label and icon.
   label_container_->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0,
                            kAroundTextPadding));
   label_container_->AddChildView(icon_);
   label_container_->AddChildView(label_);
   label_container_->AddChildView(decorated_);
   decorated_->SetVisible(false);
   // TODO(estade): get the sizing and spacing right on this textfield.
   decorated_->textfield()->set_default_width_in_chars(10);
   AddChildView(label_container_);
 
   label_line_2_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   label_line_2_->SetVisible(false);
   AddChildView(label_line_2_);
 
   // TODO(estade): The link needs to have a different color when hovered.
-  views::Link* edit_link = new views::Link(edit_label);
-  edit_link->set_listener(autofill_dialog);
-  edit_link->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  edit_link->SetUnderline(false);
+  edit_link_->set_listener(autofill_dialog);
+  edit_link_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  edit_link_->SetUnderline(false);
 
   // This container prevents the edit link from being horizontally stretched.
   views::View* link_container = new views::View();
   link_container->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
-  link_container->AddChildView(edit_link);
+  link_container->AddChildView(edit_link_);
   AddChildView(link_container);
 
   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) {
   // 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));
@@ skipping 149 matching lines @@
     output->insert(std::make_pair(it->first, it->second->textfield()->text()));
   }
   for (ComboboxMap::const_iterator it = group->comboboxes.begin();
        it != group->comboboxes.end(); ++it) {
     output->insert(std::make_pair(it->first,
         it->second->model()->GetItemAt(it->second->selected_index())));
   }
 }
 
 string16 AutofillDialogViews::GetCvc() {
-  return GroupForSection(SECTION_CC)->suggested_info->decorated_textfield()->
-      textfield()->text();
+  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::SaveDetailsInWallet() {
   return notification_area_->CheckboxIsChecked();
 }
 
@@ skipping 92 matching lines @@
   // TODO(estade): add a view to contain the terms of service.
   return NULL;
 }
 
 bool AutofillDialogViews::Cancel() {
   controller_->OnCancel();
   return true;
 }
 
 bool AutofillDialogViews::Accept() {
-  if (!ValidateForm())
-    return false;
+  if (ValidateForm())
+    controller_->OnAccept();
 
-  controller_->OnSubmit();
-
-  // Let |controller_| decide when to hide the dialog.
+  // |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());
@@ skipping 10 matching lines @@
     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;
       }
     }
     DCHECK(group);
 
+    if (!group->suggested_button->visible())
+      return;
+
     views::MenuModelAdapter adapter(
         controller_->MenuModelForSection(group->section));
     menu_runner_.reset(new views::MenuRunner(adapter.CreateMenu()));
 
     group->container->SetActive(true);
     // Ignore the result since we don't need to handle a deleted menu specially.
     ignore_result(
         menu_runner_->RunMenuAt(sender->GetWidget(),
                                 NULL,
                                 group->suggested_button->GetBoundsInScreen(),
@@ skipping 33 matching lines @@
 }
 
 void AutofillDialogViews::OnDidChangeFocus(
     views::View* focused_before,
     views::View* focused_now) {
   if (!focused_before)
     return;
 
   // If user leaves an edit-field, revalidate the group it belongs to.
   DetailsGroup* group = GroupForView(focused_before);
-  if (group)
+  if (group && group->container->visible())
     ValidateGroup(group, AutofillDialogController::VALIDATE_EDIT);
 }
 
 void AutofillDialogViews::LinkClicked(views::Link* source, int event_flags) {
   // Edit links.
   for (DetailGroupMap::iterator iter = detail_groups_.begin();
        iter != detail_groups_.end(); ++iter) {
     if (iter->second.suggested_info->Contains(source)) {
       controller_->EditClickedForSection(iter->first);
       return;
@@ skipping 112 matching lines @@
                         0);
   column_set->AddColumn(views::GridLayout::CENTER,
                         views::GridLayout::LEADING,
                         0,
                         views::GridLayout::USE_PREF,
                         0,
                         0);
   layout->StartRow(0, kColumnSetId);
 
   // The |info_view| holds |manual_inputs| and |suggested_info|, allowing the
-  // dialog toggle which is shown.
+  // 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);
 
-  if (section == SECTION_CC) {
-    // TODO(estade): don't hardcode this string.
-    suggested_info->ShowTextfield(
-        ASCIIToUTF16("CVC"),
-        controller_->IconForField(CREDIT_CARD_VERIFICATION_CODE,
-                                  string16()).AsImageSkia());
-  }
-
   // TODO(estade): Fix the appearance of this button.
   views::ImageButton* menu_button = new views::ImageButton(this);
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   menu_button->SetImage(views::CustomButton::STATE_NORMAL,
       rb.GetImageSkiaNamed(IDR_AUTOFILL_DIALOG_MENU_BUTTON));
   menu_button->SetImage(views::CustomButton::STATE_PRESSED,
       rb.GetImageSkiaNamed(IDR_AUTOFILL_DIALOG_MENU_BUTTON_P));
   layout->AddView(menu_button);
 
   DetailsGroup* group = GroupForSection(section);
@@ skipping 75 matching lines @@
 
 void AutofillDialogViews::UpdateDetailsGroupState(const DetailsGroup& group) {
   string16 suggestion_text =
       controller_->SuggestionTextForSection(group.section);
   bool show_suggestions = !suggestion_text.empty();
   group.suggested_info->SetVisible(show_suggestions);
   group.suggested_info->SetSuggestionText(suggestion_text);
   gfx::Image icon = controller_->SuggestionIconForSection(group.section);
   group.suggested_info->SetSuggestionIcon(icon);
 
+  if (group.section == SECTION_CC ||
+      (group.section == SECTION_CC_BILLING &&
+       controller_->IsSubmitPausedOn(wallet::VERIFY_CVV))) {

[Evan Stade, 2013/03/29 20:50:08]

I think this logic should move to the controller. Can we have a SectionState
struct which returns suggestion text, icon, extra textfield text, extra
textfield icon, and editability (edit link visibility) which is returned all in
one call to the controller?

[Dan Beam, 2013/03/29 21:00:32]

talking with estade@ we actually want a suggestion state, not the whole
section's state.

[Dan Beam, 2013/03/29 23:50:10]

Done.

+    // TODO(estade): don't hardcode this string.
+    group.suggested_info->ShowTextfield(
+        ASCIIToUTF16("CVC"),
+        controller_->IconForField(CREDIT_CARD_VERIFICATION_CODE,
+                                  string16()).AsImageSkia());
+  }
+
   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() && AtLeastOneSectionIsEditing());
 
+  const bool has_suggestions =
+      controller_->MenuModelForSection(group.section)->GetItemCount() > 0;
+
+  if (group.suggested_button)
+    group.suggested_button->SetVisible(has_suggestions);
+
+  if (group.suggested_info) {
+    group.suggested_info->SetEditable(
+        !controller_->IsSubmitPausedOn(wallet::VERIFY_CVV));
+  }
+
   if (group.container) {
-    group.container->SetForwardMouseEvents(show_suggestions);
+    group.container->SetForwardMouseEvents(has_suggestions && show_suggestions);
     group.container->SetVisible(controller_->SectionIsActive(group.section));
   }
 
   ContentsPreferredSizeChanged();
 }
 
 bool AutofillDialogViews::AtLeastOneSectionIsEditing() {
   for (DetailGroupMap::iterator iter = detail_groups_.begin();
        iter != detail_groups_.end(); ++iter) {
     if (iter->second.manual_input && iter->second.manual_input->visible())
@@ skipping 60 matching lines @@
 }
 
 bool AutofillDialogViews::ValidateForm() {
   bool all_valid = true;
   for (DetailGroupMap::iterator iter = detail_groups_.begin();
        iter != detail_groups_.end(); ++iter) {
     DetailsGroup* group = &iter->second;
     if (!group->container->visible())
       continue;
 
-   if (!ValidateGroup(group, AutofillDialogController::VALIDATE_FINAL))
-     all_valid = false;
+    if (!ValidateGroup(group, AutofillDialogController::VALIDATE_FINAL))
+      all_valid = false;
   }
 
   return all_valid;
 }
 
 void AutofillDialogViews::TextfieldEditedOrActivated(
     views::Textfield* textfield,
     bool was_edit) {
   DetailsGroup* group = GroupForView(textfield);
   DCHECK(group);
@@ skipping 83 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