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 215 matching lines @@
       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);
       checkbox->SetText(notification.display_text());
       checkbox->SetMultiLine(true);
       checkbox->set_alignment(views::TextButtonBase::ALIGN_LEFT);
       checkbox->SetEnabledColor(notification.GetTextColor());
       checkbox->SetHoverColor(notification.GetTextColor());
       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 =
@@ skipping 306 matching lines @@
   details_container_->SetVisible(!(controller_->AutocheckoutIsRunning() ||
                                    controller_->HadAutocheckoutError()));
 
   GetDialogClientView()->UpdateDialogButtons();
   ContentsPreferredSizeChanged();
 }
 
 void AutofillDialogViews::UpdateNotificationArea() {
   DCHECK(notification_area_);
   notification_area_->SetNotifications(controller_->CurrentNotifications());
+
+  views::Checkbox* checkbox = notification_area_->checkbox();
+  if (checkbox) {
+    checkbox->SetChecked(!controller_->GetPayWithoutWallet());

[Dan Beam, 2013/04/05 02:45:57]

an alternative to this would be to use prefs directly in the view and/or pass
|controller_| to |notification_area_| so it can ask
|controller_->GetPayWithoutWallet()| directly during creation

[Evan Stade, 2013/04/05 23:38:23]

make initial checkmark state part of the notification

[Dan Beam, 2013/04/06 04:49:50]

Done.

+    checkbox->set_listener(this);

[Dan Beam, 2013/04/05 02:45:57]

^ an alternative to this would be to have the notification area itself be a
buttonlistener and pass in a reference to |controller_| (so it'd be able to say
controller_->SetPayWithoutWallet()) or just use prefs directly

[Evan Stade, 2013/04/05 23:38:23]

pass controller_ in and have the NotificationArea listen for changes. When
there's a change, call
controller_->CheckboxStateChanged(DialogNotification.type(), checked);

[Dan Beam, 2013/04/06 04:49:50]

Done.

+  }
+
   ContentsPreferredSizeChanged();
 }
 
 void AutofillDialogViews::UpdateSection(DialogSection section) {
   const DetailInputs& updated_inputs =
       controller_->RequestedFieldsForSection(section);
   DetailsGroup* group = GroupForSection(section);
 
   for (DetailInputs::const_iterator iter = updated_inputs.begin();
        iter != updated_inputs.end(); ++iter) {
@@ skipping 35 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 114 matching lines @@
       widget,
       controller_->web_contents()->GetBrowserContext());
 }
 
 void AutofillDialogViews::ButtonPressed(views::Button* sender,
                                         const ui::Event& event) {
   if (sender == use_billing_for_shipping_) {
     UpdateDetailsGroupState(*GroupForSection(SECTION_SHIPPING));
   } else if (sender == cancel_sign_in_) {
     controller_->EndSignInFlow();
+  } else if (sender == notification_area_->checkbox()) {
+    controller_->SetPayWithoutWallet(
+        !notification_area_->checkbox()->checked());
   } 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 518 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