AutofillPopupController clarifications + simplifications.

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/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
@@ skipping 75 matching lines @@
 AutofillDialogViews::~AutofillDialogViews() {
   DCHECK(!window_);
 }
 
 void AutofillDialogViews::Show() {
   InitChildViews();
 
   // Ownership of |contents_| is handed off by this call. The ConstrainedWindow
   // will take care of deleting itself after calling DeleteDelegate().
   window_ = new ConstrainedWindowViews(controller_->web_contents(), this);
+  window_->GetFocusManager()->AddFocusChangeListener(this);

[Ilya Sherman, 2012/12/20 21:57:42]

This diff is not part of this CL.

[Evan Stade, 2012/12/20 23:04:00]

please ignore the parts that are part of my previous CLs.

+}
+
+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) {
+    TextfieldMap::iterator input = group->textfields.find(&(*iter));
+    if (input == group->textfields.end())
+      continue;
+
+    input->second->SetText(iter->autofilled_value);
+  }
 }
 
 int AutofillDialogViews::GetSuggestionSelection(DialogSection section) {
   return GroupForSection(section)->suggested_input->selected_index();
 }
 
 void AutofillDialogViews::GetUserInput(DialogSection section,
                                        DetailOutputMap* output) {
   DetailsGroup* group = GroupForSection(section);
   for (TextfieldMap::iterator it = group->textfields.begin();
@@ skipping 10 matching lines @@
 }
 
 bool AutofillDialogViews::UseBillingForShipping() {
   return use_billing_for_shipping_->checked();
 }
 
 string16 AutofillDialogViews::GetWindowTitle() const {
   return controller_->DialogTitle();
 }
 
+void AutofillDialogViews::WindowClosing() {
+  window_->GetFocusManager()->RemoveFocusChangeListener(this);
+}
+
 void AutofillDialogViews::DeleteDelegate() {
   window_ = NULL;
   // |this| belongs to |controller_|.
   controller_->ViewClosed(did_submit_ ? ACTION_SUBMIT : ACTION_ABORT);
 }
 
 views::Widget* AutofillDialogViews::GetWidget() {
   return contents_->GetWidget();
 }
 
@@ skipping 36 matching lines @@
   DetailsGroup* group =
       combobox == email_.suggested_input ? &email_ :
       combobox == cc_.suggested_input ? &cc_ :
       combobox == billing_.suggested_input ? &billing_ :
       combobox == shipping_.suggested_input ? &shipping_ : NULL;
   DCHECK(group);
   UpdateDetailsGroupState(*group);
   GetWidget()->SetSize(GetWidget()->non_client_view()->GetPreferredSize());
 }
 
+void AutofillDialogViews::ContentsChanged(views::Textfield* sender,
+                                          const string16& new_contents) {
+  // TODO(estade): work for not billing.
+  for (TextfieldMap::iterator iter = billing_.textfields.begin();
+       iter != billing_.textfields.end();
+       ++iter) {
+    if (iter->second == sender) {
+      controller_->UserEditedInput(iter->first,
+                                   GetWidget()->GetNativeView(),
+                                   sender->GetBoundsInScreen(),
+                                   new_contents);
+      break;
+    }
+  }
+}
+
+bool AutofillDialogViews::HandleKeyEvent(views::Textfield* sender,
+                                         const ui::KeyEvent& key_event) {
+  // TODO(estade): implement.
+  return false;
+}
+
+void AutofillDialogViews::OnWillChangeFocus(
+    views::View* focused_before,
+    views::View* focused_now) {
+  controller_->FocusMoved();
+}
+
+void AutofillDialogViews::OnDidChangeFocus(
+    views::View* focused_before,
+    views::View* focused_now) {}
+
 void AutofillDialogViews::InitChildViews() {
   contents_ = new views::View();
   views::GridLayout* layout = new views::GridLayout(contents_);
   contents_->SetLayoutManager(layout);
 
   const int single_column_set = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(single_column_set);
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,
@@ skipping 173 matching lines @@
 
     ui::ComboboxModel* input_model =
         controller_->ComboboxModelForAutofillType(input.type);
     // TODO(estade): TextFields and Comboboxes need to be the same height.
     if (input_model) {
       views::Combobox* combobox = new views::Combobox(input_model);
       comboboxes->insert(std::make_pair(&input, combobox));
       layout->AddView(combobox);
 
       for (int i = 0; i < input_model->GetItemCount(); ++i) {
-        if (input.starting_value == input_model->GetItemAt(i)) {
+        if (input.autofilled_value == input_model->GetItemAt(i)) {
           combobox->SetSelectedIndex(i);
           break;
         }
       }
     } else {
       views::Textfield* field = new views::Textfield();
       field->set_placeholder_text(ASCIIToUTF16(input.placeholder_text));
-      field->SetText(input.starting_value);
+      field->SetText(input.autofilled_value);
+      field->SetController(this);
       textfields->insert(std::make_pair(&input, field));
       layout->AddView(field);
     }
   }
 
   return view;
 }
 
 void AutofillDialogViews::UpdateDetailsGroupState(const DetailsGroup& group) {
   views::Combobox* combobox = group.suggested_input;
@@ skipping 23 matching lines @@
 }
 
 AutofillDialogViews::DetailsGroup::DetailsGroup()
     : container(NULL),
       suggested_input(NULL),
       manual_input(NULL) {}
 
 AutofillDialogViews::DetailsGroup::~DetailsGroup() {}
 
 }  // namespace autofill