[rac] Show amex specific cvc hint

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/location.h"
@@ skipping 1915 matching lines @@
         }
       }
 
       view_to_add.reset(combobox);
     } else {
       DecoratedTextfield* field = new DecoratedTextfield(
           input.initial_value,
           l10n_util::GetStringUTF16(input.placeholder_text_rid),
           this);
 
-      gfx::Image icon =
-          delegate_->IconForField(input.type, input.initial_value);
-      field->SetIcon(icon);
-
       textfields->insert(std::make_pair(&input, field));
       view_to_add.reset(field);
     }
 
     int kColumnSetId = input.row_id;
     if (kColumnSetId < 0) {
       other_owned_views_.push_back(view_to_add.release());
       continue;
     }
 
@@ skipping 21 matching lines @@
                           0);
 
     // This is the same as AddView(view_to_add), except that 1 is used for the
     // view's preferred width. Thus the width of the column completely depends
     // on |expand|.
     layout->AddView(view_to_add.release(), 1, 1,
                     views::GridLayout::FILL, views::GridLayout::FILL,
                     1, 0);
   }
 
+  SetIconsForSection(section);
+
   return view;
 }
 
 void AutofillDialogViews::UpdateSectionImpl(
     DialogSection section,
     bool clobber_inputs) {
   const DetailInputs& updated_inputs =
       delegate_->RequestedFieldsForSection(section);
   DetailsGroup* group = GroupForSection(section);
 
   for (DetailInputs::const_iterator iter = updated_inputs.begin();
        iter != updated_inputs.end(); ++iter) {
     const DetailInput& input = *iter;
     TextfieldMap::iterator text_mapping = group->textfields.find(&input);
 
     if (text_mapping != group->textfields.end()) {
       DecoratedTextfield* decorated = text_mapping->second;
       decorated->SetEnabled(input.editable);
-      if (decorated->text().empty() || clobber_inputs) {
+      if (decorated->text().empty() || clobber_inputs)
         decorated->SetText(iter->initial_value);
-        decorated->SetIcon(
-            delegate_->IconForField(input.type, decorated->text()));
-      }
     }
 
     ComboboxMap::iterator combo_mapping = group->comboboxes.find(&input);
     if (combo_mapping != group->comboboxes.end()) {
       views::Combobox* combobox = combo_mapping->second;
       combobox->SetEnabled(input.editable);
       if (combobox->selected_index() == combobox->model()->GetDefaultIndex() ||
           clobber_inputs) {
         for (int i = 0; i < combobox->model()->GetItemCount(); ++i) {
           if (input.initial_value == combobox->model()->GetItemAt(i)) {
             combobox->SetSelectedIndex(i);
             break;
           }
         }
       }
     }
   }
 
+  SetIconsForSection(section);
   UpdateDetailsGroupState(*group);
 }
 
 void AutofillDialogViews::UpdateDetailsGroupState(const DetailsGroup& group) {
   const SuggestionState& suggestion_state =
       delegate_->SuggestionStateForSection(group.section);
   group.suggested_info->SetState(suggestion_state);
   group.manual_input->SetVisible(!suggestion_state.visible);
 
   UpdateButtonStripExtraView();
@@ skipping 198 matching lines @@
 
   // If the field is marked as invalid, check if the text is now valid.
   // Many fields (i.e. CC#) are invalid for most of the duration of editing,
   // so flagging them as invalid prematurely is not helpful. However,
   // correcting a minor mistake (i.e. a wrong CC digit) should immediately
   // result in validation - positive user feedback.
   if (decorated->invalid() && was_edit) {
     SetValidityForInput<DecoratedTextfield>(
         decorated,
         delegate_->InputValidityMessage(group->section, type,
-                                          textfield->text()));
+                                        textfield->text()));
 
     // If the field transitioned from invalid to valid, re-validate the group,
     // since inter-field checks become meaningful with valid fields.
     if (!decorated->invalid())
       ValidateGroup(*group, VALIDATE_EDIT);
   }
 
-  gfx::Image icon = delegate_->IconForField(type, textfield->text());
-  decorated->SetIcon(icon);
+  if (delegate_->FieldControlsIcons(type))
+    SetIconsForSection(group->section);
 }
 
 void AutofillDialogViews::UpdateButtonStripExtraView() {
   save_in_chrome_checkbox_container_->SetVisible(
       delegate_->ShouldOfferToSaveInChrome());
 
   gfx::Image image = delegate_->ButtonStripImage();
   button_strip_image_->SetVisible(!image.IsEmpty());
   button_strip_image_->SetImage(image.AsImageSkia());
 }
@@ skipping 72 matching lines @@
 void AutofillDialogViews::DetailsContainerBoundsChanged() {
   if (error_bubble_)
     error_bubble_->UpdatePosition();
 }
 
 bool AutofillDialogViews::SignInWebviewDictatesHeight() const {
   return sign_in_webview_->visible() ||
       (sign_in_webview_->web_contents() && delegate_->ShouldShowSpinner());
 }
 
+void AutofillDialogViews::SetIconsForSection(DialogSection section) {
+  DetailOutputMap user_input;
+  GetUserInput(section, &user_input);
+  FieldValueMap field_values;
+  for (DetailOutputMap::const_iterator user_input_it = user_input.begin();
+       user_input_it != user_input.end();
+       ++user_input_it) {
+    const DetailInput* field_detail = user_input_it->first;
+    const string16& field_value = user_input_it->second;
+    field_values[field_detail->type] = field_value;
+  }
+  FieldIconMap field_icons = delegate_->IconsForFields(field_values);
+  TextfieldMap* textfields = &GroupForSection(section)->textfields;
+  for (TextfieldMap::const_iterator textfield_it = textfields->begin();
+       textfield_it != textfields->end();
+       ++textfield_it) {
+    ServerFieldType field_type = textfield_it->first->type;
+    FieldIconMap::const_iterator field_icon_it = field_icons.find(field_type);
+    DecoratedTextfield* textfield = textfield_it->second;
+    if (field_icon_it == field_icons.end()) {

[Evan Stade, 2013/09/17 19:59:06]

nit:

textfield->SetIcon(field_icon_it == field_icons.end() ? gfx::Image() :
field_icon_it->second);

[please use gerrit instead, 2013/09/17 20:32:24]

Done.

+      textfield->SetIcon(gfx::Image());
+      continue;
+    }
+    const gfx::Image& field_icon = field_icon_it->second;
+    textfield->SetIcon(field_icon);
+  }
+}
+
 AutofillDialogViews::DetailsGroup::DetailsGroup(DialogSection section)
     : section(section),
       container(NULL),
       manual_input(NULL),
       suggested_info(NULL),
       suggested_button(NULL) {}
 
 AutofillDialogViews::DetailsGroup::~DetailsGroup() {}
 
 }  // namespace autofill