Upgrade Seperator in New Autofill UI

chrome/browser/autofill/autofill_external_delegate.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 "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 18 matching lines @@
       password_autofill_manager_(
           tab_contents_wrapper ? tab_contents_wrapper->web_contents() : NULL),
       autofill_query_id_(0),
       display_warning_if_disabled_(false),
       has_shown_autofill_popup_for_current_edit_(false) {
 }
 
 void AutofillExternalDelegate::SelectAutofillSuggestionAtIndex(int unique_id) {
   if (unique_id == WebAutofillClient::MenuItemIDAutofillOptions ||
       unique_id == WebAutofillClient::MenuItemIDClearForm ||
+      unique_id == WebAutofillClient::MenuItemIDSeparator ||
       unique_id == WebAutofillClient::MenuItemIDWarningMessage)
     return;
 
   ClearPreviewedForm();
 
   if (unique_id == WebAutofillClient::MenuItemIDPasswordEntry)
     return;
 
   FillAutofillFormData(unique_id, true);
 }
@@ skipping 24 matching lines @@
     // No suggestions, any popup currently showing is obsolete.
     HideAutofillPopup();
     return;
   }
 
   std::vector<string16> v(values);
   std::vector<string16> l(labels);
   std::vector<string16> i(icons);
   std::vector<int> ids(unique_ids);
 
+  // Add a separator to go between the values and menu items.
+  v.push_back(string16());
+  l.push_back(string16());
+  i.push_back(string16());
+  ids.push_back(WebAutofillClient::MenuItemIDSeparator);
+
   DCHECK_GT(ids.size(), 0U);
   if (!autofill_query_field_.should_autocomplete) {
     // If autofill is disabled and we had suggestions, show a warning instead.
     v.assign(1, l10n_util::GetStringUTF16(IDS_AUTOFILL_WARNING_FORM_DISABLED));
     l.assign(1, string16());
     i.assign(1, string16());
     ids.assign(1, WebAutofillClient::MenuItemIDWarningMessage);
   } else if (ids[0] < 0 && ids.size() > 1) {
     // If we received a warning instead of suggestions from autofill but regular
     // suggestions from autocomplete, don't show the autofill warning.
@@ skipping 27 matching lines @@
   }
 
   if (has_autofill_item) {
     // Append the 'Chrome Autofill options' menu item;
     v.push_back(l10n_util::GetStringUTF16(IDS_AUTOFILL_OPTIONS_POPUP));
     l.push_back(string16());
     i.push_back(string16());
     ids.push_back(WebAutofillClient::MenuItemIDAutofillOptions);
   }
 
+  // Remove the separator if it is the last element.
+  if (*(ids.rbegin()) == WebAutofillClient::MenuItemIDSeparator) {
+    v.pop_back();
+    l.pop_back();
+    i.pop_back();
+    ids.pop_back();
+  }
+
   // Send to display.
   if (!v.empty() && autofill_query_field_.is_focusable)
     ApplyAutofillSuggestions(v, l, i, ids);
 
   tab_contents_wrapper_->autofill_manager()->OnDidShowAutofillSuggestions(
       has_autofill_item && !has_shown_autofill_popup_for_current_edit_);
   has_shown_autofill_popup_for_current_edit_ |= has_autofill_item;
 }
 
 void AutofillExternalDelegate::OnShowPasswordSuggestions(
@@ skipping 118 matching lines @@
 // none, so all platforms use the default.
 
 #if !defined(OS_ANDROID) && !defined(TOOLKIT_GTK)
 
 AutofillExternalDelegate* AutofillExternalDelegate::Create(
     TabContentsWrapper*, AutofillManager*) {
   return NULL;
 }
 
 #endif