Expanded Autofill Credit Card Popup Layout Experiment in Android.

components/autofill/core/browser/autofill_external_delegate.cc

 // Copyright 2013 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 "components/autofill/core/browser/autofill_external_delegate.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/i18n/case_conversion.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/metrics/user_metrics.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "components/autofill/core/browser/autocomplete_history_manager.h"
 #include "components/autofill/core/browser/autofill_driver.h"
+#include "components/autofill/core/browser/autofill_experiments.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/common/autofill_util.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
 
 namespace {
 
 // Returns true if the suggestion entry is an Autofill warning message.
 // Warning messages should display on top of suggestion list.
 bool IsAutofillWarningEntry(int frontend_id) {
   return frontend_id ==
              POPUP_ITEM_ID_INSECURE_CONTEXT_PAYMENT_DISABLED_MESSAGE ||
          frontend_id == POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE;
 }
 
 } // anonymous namespace
 
 AutofillExternalDelegate::AutofillExternalDelegate(AutofillManager* manager,
                                                    AutofillDriver* driver)
     : manager_(manager),
       driver_(driver),
       query_id_(0),
       has_autofill_suggestions_(false),
       has_shown_popup_for_current_edit_(false),
       should_show_scan_credit_card_(false),
+      is_credit_card_field_(false),
       should_show_cc_signin_promo_(false),
       has_shown_address_book_prompt(false),
       weak_ptr_factory_(this) {
   DCHECK(manager);
 }
 
 AutofillExternalDelegate::~AutofillExternalDelegate() {}
 
 void AutofillExternalDelegate::OnQuery(int query_id,
                                        const FormData& form,
                                        const FormFieldData& field,
                                        const gfx::RectF& element_bounds) {
   if (!query_form_.SameFormAs(form))
     has_shown_address_book_prompt = false;
 
   query_form_ = form;
   query_field_ = field;
   query_id_ = query_id;
   element_bounds_ = element_bounds;
   should_show_scan_credit_card_ =
       manager_->ShouldShowScanCreditCard(query_form_, query_field_);
+  is_credit_card_field_ =
+      manager_->IsCreditCardField(query_form_, query_field_);
   should_show_cc_signin_promo_ =
       manager_->ShouldShowCreditCardSigninPromo(query_form_, query_field_);
 }
 
 void AutofillExternalDelegate::OnSuggestionsReturned(
     int query_id,
     const std::vector<Suggestion>& input_suggestions) {
   if (query_id != query_id_)
     return;
 
@@ skipping 184 matching lines @@
 void AutofillExternalDelegate::DidEndTextFieldEditing() {
   manager_->client()->HideAutofillPopup();
 
   has_shown_popup_for_current_edit_ = false;
 }
 
 void AutofillExternalDelegate::ClearPreviewedForm() {
   driver_->RendererShouldClearPreviewedForm();
 }
 
+bool AutofillExternalDelegate::IsCreditCardField() {
+  return is_credit_card_field_;
+}
+
 void AutofillExternalDelegate::Reset() {
   manager_->client()->HideAutofillPopup();
 }
 
 void AutofillExternalDelegate::OnPingAck() {
   // Reissue the most recent query, which will reopen the Autofill popup.
   manager_->OnQueryFormFieldAutofill(query_id_, query_form_, query_field_,
                                      element_bounds_);
 }
 
@@ skipping 36 matching lines @@
   }
 }
 
 void AutofillExternalDelegate::ApplyAutofillOptions(
     std::vector<Suggestion>* suggestions) {
   // The form has been auto-filled, so give the user the chance to clear the
   // form.  Append the 'Clear form' menu item.
   if (query_field_.is_autofilled) {
     base::string16 value =
         l10n_util::GetStringUTF16(IDS_AUTOFILL_CLEAR_FORM_MENU_ITEM);
-    // TODO(rouslan): Remove manual upper-casing when keyboard accessory becomes
-    // default on Android.
     if (IsKeyboardAccessoryEnabled())
       value = base::i18n::ToUpper(value);
 
     suggestions->push_back(Suggestion(value));
     suggestions->back().frontend_id = POPUP_ITEM_ID_CLEAR_FORM;
   }
 
-  // Append the 'Chrome Autofill options' menu item;
-  // TODO(rouslan): Switch on the platform in the GRD file when keyboard
-  // accessory becomes default on Android.
-  suggestions->push_back(Suggestion(l10n_util::GetStringUTF16(
-      IsKeyboardAccessoryEnabled() ? IDS_AUTOFILL_OPTIONS_CONTENT_DESCRIPTION
-                                   : IDS_AUTOFILL_OPTIONS_POPUP)));
+  // Append the 'Chrome Autofill options' menu item, or the menu item specified
+  // in the popup layout experiment.
+  suggestions->push_back(Suggestion(GetSettingsSuggestionValue()));
   suggestions->back().frontend_id = POPUP_ITEM_ID_AUTOFILL_OPTIONS;
   if (IsKeyboardAccessoryEnabled())
     suggestions->back().icon = base::ASCIIToUTF16("settings");
 }
 
 void AutofillExternalDelegate::InsertDataListValues(
     std::vector<Suggestion>* suggestions) {
   if (data_list_values_.empty())
     return;
 
@@ skipping 22 matching lines @@
   // Insert the datalist elements at the beginning.
   suggestions->insert(suggestions->begin(), data_list_values_.size(),
                       Suggestion());
   for (size_t i = 0; i < data_list_values_.size(); i++) {
     (*suggestions)[i].value = data_list_values_[i];
     (*suggestions)[i].label = data_list_labels_[i];
     (*suggestions)[i].frontend_id = POPUP_ITEM_ID_DATALIST_ENTRY;
   }
 }
 
+base::string16 AutofillExternalDelegate::GetSettingsSuggestionValue()
+    const {
+  if (IsKeyboardAccessoryEnabled()) {
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_OPTIONS_CONTENT_DESCRIPTION);
+  }
+  if (is_credit_card_field_) {
+    const base::string16 suggestion_value =
+        l10n_util::GetStringUTF16(IDS_AUTOFILL_CREDIT_CARD_OPTIONS_POPUP);
+    if (!suggestion_value.empty())

[Mathieu, 2016/11/30 21:27:35]

why would it be empty?

[csashi, 2016/12/01 01:13:43]

I wasn't sure how the resource strings get populated in different locales. I was
guarding against a case where the string was not yet translated. If that is not
possible, I can remove this. I changed code to always use
IDS_AUTOFILL_CREDIT_CARD_OPTIONS_POPUP for the settings text that we can later
override in an experiment.

[Mathieu, 2016/12/01 21:59:46]

yes assume it is translated

[csashi, 2016/12/02 05:15:29]

Done.

+      return suggestion_value;
+  }
+  return l10n_util::GetStringUTF16(IDS_AUTOFILL_OPTIONS_POPUP);
+}
+
 }  // namespace autofill