Android - Introduce "keyboard accessory" for Autofill suggestions.

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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 70 matching lines @@
     int query_id,
     const std::vector<Suggestion>& input_suggestions) {
   if (query_id != query_id_)
     return;
 
   std::vector<Suggestion> suggestions(input_suggestions);
 
   // Add or hide warnings as appropriate.
   ApplyAutofillWarnings(&suggestions);
 
+#if !defined(OS_ANDROID)
   // Add a separator to go between the values and menu items.
   suggestions.push_back(Suggestion());
   suggestions.back().frontend_id = POPUP_ITEM_ID_SEPARATOR;
+#endif
 
   if (should_show_scan_credit_card_) {
     Suggestion scan_credit_card(
         l10n_util::GetStringUTF16(IDS_AUTOFILL_SCAN_CREDIT_CARD));
     scan_credit_card.frontend_id = POPUP_ITEM_ID_SCAN_CREDIT_CARD;
     scan_credit_card.icon = base::ASCIIToUTF16("scanCreditCardIcon");
     suggestions.push_back(scan_credit_card);
 
     if (!has_shown_popup_for_current_edit_) {
       AutofillMetrics::LogScanCreditCardPromptMetric(
           AutofillMetrics::SCAN_CARD_ITEM_SHOWN);
     }
   }
 
   // Only include "Autofill Options" special menu item if we have Autofill
   // suggestions.
   has_suggestion_ = false;
   for (size_t i = 0; i < suggestions.size(); ++i) {
     if (suggestions[i].frontend_id > 0) {
       has_suggestion_ = true;
       break;
     }
   }
 
   if (has_suggestion_)
     ApplyAutofillOptions(&suggestions);
 
+#if !defined(OS_ANDROID)
   // Remove the separator if it is the last element.
   DCHECK_GT(suggestions.size(), 0U);
   if (suggestions.back().frontend_id == POPUP_ITEM_ID_SEPARATOR)
     suggestions.pop_back();
+#endif
 
   // If anything else is added to modify the values after inserting the data
   // list, AutofillPopupControllerImpl::UpdateDataListValues will need to be
   // updated to match.
   InsertDataListValues(&suggestions);
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   if (suggestions.empty() &&
       manager_->ShouldShowAccessAddressBookSuggestion(query_form_,
                                                       query_field_)) {
@@ skipping 217 matching lines @@
   suggestions->push_back(Suggestion(
       l10n_util::GetStringUTF16(IDS_AUTOFILL_OPTIONS_POPUP)));
   suggestions->back().frontend_id = POPUP_ITEM_ID_AUTOFILL_OPTIONS;
 }
 
 void AutofillExternalDelegate::InsertDataListValues(
     std::vector<Suggestion>* suggestions) {
   if (data_list_values_.empty())
     return;
 
+#if !defined(OS_ANDROID)
   // Insert the separator between the datalist and Autofill values (if there
   // are any).
   if (!suggestions->empty()) {
     suggestions->insert(suggestions->begin(), Suggestion());
     (*suggestions)[0].frontend_id = POPUP_ITEM_ID_SEPARATOR;
   }
+#endif
 
   // 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;
   }
 }
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 void AutofillExternalDelegate::PingRenderer() {
   driver_->PingRenderer();
 }
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 
 }  // namespace autofill