Upgrade Seperator in New Autofill UI

chrome/browser/autofill/autofill_popup_view.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/autofill/autofill_popup_view.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 103 matching lines @@
   SetSelectedLine(new_selected_line);
 }
 
 bool AutofillPopupView::AcceptSelectedLine() {
   if (selected_line_ == kNoSelection)
     return false;
 
   DCHECK_GE(selected_line_, 0);
   DCHECK_LT(selected_line_, static_cast<int>(autofill_values_.size()));
 
+  if (!CanAccept(autofill_unique_ids_[selected_line_]))
+    return false;
+
   return external_delegate()->DidAcceptAutofillSuggestions(
       autofill_values_[selected_line_],
       autofill_unique_ids_[selected_line_],
       selected_line_);
 }
 
 bool AutofillPopupView::RemoveSelectedLine() {
   if (selected_line_ == kNoSelection)
     return false;
 
@@ skipping 21 matching lines @@
   ResizePopup();
 
   SetSelectedLine(kNoSelection);
 
   if (!HasAutofillEntries())
     Hide();
 
   return true;
 }
 
-bool AutofillPopupView::IsSeparatorIndex(int index) {
-  // TODO(csharp): Use WebAutofillClient::MenuItemIDSeparator instead.
-  // http://crbug.com/125001
-  return (index > 0 && autofill_unique_ids_[index - 1] >= 0 &&
-          autofill_unique_ids_[index] < 0);
-}
-
 int AutofillPopupView::GetIconResourceID(const string16& resource_name) {
   for (size_t i = 0; i < arraysize(kDataResources); ++i) {
     if (resource_name == ASCIIToUTF16(kDataResources[i].name))
       return kDataResources[i].id;
   }
 
   return -1;
 }
 
+bool AutofillPopupView::CanAccept(int id) {
+  return id != WebAutofillClient::MenuItemIDSeparator;
+}
+
 bool AutofillPopupView::CanDelete(int id) {
   return id > 0 ||
       id == WebAutofillClient::MenuItemIDAutocompleteEntry ||
       id == WebAutofillClient::MenuItemIDPasswordEntry;
 }
 
 bool AutofillPopupView::HasAutofillEntries() {
   return autofill_values_.size() != 0 &&
       (autofill_unique_ids_[0] > 0 ||
        autofill_unique_ids_[0] ==
          WebAutofillClient::MenuItemIDAutocompleteEntry ||
        autofill_unique_ids_[0] == WebAutofillClient::MenuItemIDPasswordEntry ||
        autofill_unique_ids_[0] == WebAutofillClient::MenuItemIDDataListEntry);
 }
 
 void AutofillPopupView::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED) {
     if (!*content::Details<bool>(details).ptr())
       Hide();
   } else if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     Hide();
   }
 }