Change the behavior of the [X] Save details to Wallet checkbox notification to:

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 218 matching lines @@
                               0));
 }
 
 void AutofillDialogViews::AccountChooser::LinkClicked(views::Link* source,
                                                       int event_flags) {
   controller_->StartSignInFlow();
 }
 
 // AutofillDialogViews::NotificationArea ---------------------------------------
 
-AutofillDialogViews::NotificationArea::NotificationArea()
-    : checkbox_(NULL) {
+AutofillDialogViews::NotificationArea::NotificationArea(
+    AutofillDialogController* controller)
+    : controller_(controller),
+      checkbox_(NULL) {
   // Reserve vertical space for the arrow (regardless of whether one exists).
   set_border(views::Border::CreateEmptyBorder(kArrowHeight, 0, 0, 0));
 
   views::BoxLayout* box_layout =
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0);
   SetLayoutManager(box_layout);
 }
 
 AutofillDialogViews::NotificationArea::~NotificationArea() {}
 
 void AutofillDialogViews::NotificationArea::SetNotifications(
     const std::vector<DialogNotification>& notifications) {
   notifications_ = notifications;
 
-  // Default checkbox to checked. Preserve checkbox state if it already exists.
-  bool checkbox_state = checkbox_ ? checkbox_->checked() : true;
   RemoveAllChildViews(true);
   checkbox_ = NULL;
 
   if (notifications_.empty())
     return;
 
   for (size_t i = 0; i < notifications_.size(); ++i) {
     const DialogNotification& notification = notifications_[i];
 
     scoped_ptr<views::View> view;
     if (notification.HasCheckbox()) {
       scoped_ptr<views::Checkbox> checkbox(new views::Checkbox(string16()));
       checkbox_ = checkbox.get();
       // We have to do this instead of using set_border() because a border
       // is being used to draw the check square.
       static_cast<views::CheckboxNativeThemeBorder*>(checkbox->border())->
           SetCustomInsets(gfx::Insets(kNotificationPadding,
                                       kNotificationPadding,
                                       kNotificationPadding,
                                       kNotificationPadding));
-      checkbox->SetChecked(checkbox_state);
       if (!notification.interactive())
         checkbox->SetState(views::Button::STATE_DISABLED);
       checkbox->SetText(notification.display_text());
       checkbox->SetMultiLine(true);
       checkbox->set_alignment(views::TextButtonBase::ALIGN_LEFT);
       checkbox->SetEnabledColor(notification.GetTextColor());
       checkbox->SetHoverColor(notification.GetTextColor());
+      checkbox->SetChecked(notification.checked());
+      checkbox->set_listener(this);
       view.reset(checkbox.release());
     } else {
       scoped_ptr<views::Label> label(new views::Label());
       label->SetText(notification.display_text());
       label->SetMultiLine(true);
       label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
       label->SetAutoColorReadabilityEnabled(false);
       label->SetEnabledColor(notification.GetTextColor());
       label->set_border(views::Border::CreateSolidBorder(
           kNotificationPadding, notification.GetBackgroundColor()));
       view.reset(label.release());
     }
 
     view->set_background(views::Background::CreateSolidBackground(
         notification.GetBackgroundColor()));
     AddChildView(view.release());
   }
 
   PreferredSizeChanged();
 }
 
-bool AutofillDialogViews::NotificationArea::CheckboxIsChecked() const {
-  return checkbox_ && checkbox_->checked();
-}
-
 std::string AutofillDialogViews::NotificationArea::GetClassName() const {
   return kNotificationAreaClassName;
 }
 
 void AutofillDialogViews::NotificationArea::OnPaint(gfx::Canvas* canvas) {
   views::View::OnPaint(canvas);
 
   if (HasArrow()) {
     const int arrow_half_width = kArrowWidth / 2.0f;
     const int anchor_half_width =
         arrow_centering_anchor_->width() / 2.0f;
     const int arrow_middle =
         GetMirroredXInView(width() - anchor_half_width - arrow_half_width);
 
     SkPath arrow;
     arrow.moveTo(arrow_middle - arrow_half_width, kArrowHeight);
     arrow.lineTo(arrow_middle + arrow_half_width, kArrowHeight);
     arrow.lineTo(arrow_middle, 0);
     arrow.close();
     canvas->ClipPath(arrow);
     canvas->DrawColor(notifications_[0].GetBackgroundColor());
   }
 }
 
+void AutofillDialogViews::NotificationArea::ButtonPressed(
+    views::Button* sender, const ui::Event& event) {
+  DCHECK_EQ(sender, checkbox_);
+  controller_->CheckboxStateChanged(notifications_.front().type(),
+                                    checkbox_->checked());
+}
+
 bool AutofillDialogViews::NotificationArea::HasArrow() {
   return !notifications_.empty() && notifications_[0].HasArrow() &&
       arrow_centering_anchor_.get();
 }
 
 // AutofillDialogViews::SectionContainer ---------------------------------------
 
 AutofillDialogViews::SectionContainer::SectionContainer(
     const string16& label,
     views::View* controls,
@@ skipping 352 matching lines @@
   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();
-}
-
 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 274 matching lines @@
 views::View* AutofillDialogViews::CreateMainContainer() {
   main_container_ = new views::View();
   main_container_->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0,
                            views::kRelatedControlVerticalSpacing));
 
   account_chooser_ = new AccountChooser(controller_);
   if (!views::DialogDelegate::UseNewStyle())
     main_container_->AddChildView(account_chooser_);
 
-  notification_area_ = new NotificationArea();
+  notification_area_ = new NotificationArea(controller_);
   notification_area_->set_arrow_centering_anchor(account_chooser_->AsWeakPtr());
   main_container_->AddChildView(notification_area_);
 
   main_container_->AddChildView(CreateDetailsContainer());
   return main_container_;
 }
 
 views::View* AutofillDialogViews::CreateDetailsContainer() {
   details_container_ = new views::View();
   // A box layout is used because it respects widget visibility.
@@ skipping 376 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