Moving the autofill enum from blink side to browser side

chrome/browser/ui/autofill/autofill_popup_controller_impl.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/autofill/autofill_popup_controller_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
 #include "chrome/browser/ui/autofill/popup_constants.h"
 #include "components/autofill/core/browser/autofill_popup_delegate.h"
+#include "components/autofill/core/common/autofill_enums.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "grit/webkit_resources.h"
-#include "third_party/WebKit/public/web/WebAutofillClient.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/gfx/vector2d.h"
 
 using base::WeakPtr;
-using blink::WebAutofillClient;
 
 namespace autofill {
 namespace {
 
 // Used to indicate that no line is currently selected by the user.
 const int kNoSelection = -1;
 
 // The vertical height of each row in pixels.
 const size_t kRowHeight = 24;
 
@@ skipping 144 matching lines @@
   delegate_->OnPopupShown();
   controller_common_->RegisterKeyPressCallback();
 }
 
 void AutofillPopupControllerImpl::UpdateDataListValues(
     const std::vector<base::string16>& values,
     const std::vector<base::string16>& labels) {
   // Remove all the old data list values, which should always be at the top of
   // the list if they are present.
   while (!identifiers_.empty() &&
-         identifiers_[0] == WebAutofillClient::MenuItemIDDataListEntry) {
+         identifiers_[0] == MenuItemIDDataListEntry) {

[Ilya Sherman, 2014/02/11 22:21:33]

nit: Looks like this line no longer needs to wrap.

[gnana, 2014/02/12 13:34:09]

Done.

     names_.erase(names_.begin());
     subtexts_.erase(subtexts_.begin());
     icons_.erase(icons_.begin());
     identifiers_.erase(identifiers_.begin());
   }
 
   // If there are no new data list values, exit (clearing the separator if there
   // is one).
   if (values.empty()) {
     if (!identifiers_.empty() &&
-        identifiers_[0] == WebAutofillClient::MenuItemIDSeparator) {
+        identifiers_[0] == MenuItemIDSeparator) {

[Ilya Sherman, 2014/02/11 22:21:33]

nit: Looks like this line no longer needs to wrap.

[gnana, 2014/02/12 13:34:09]

Done.

       names_.erase(names_.begin());
       subtexts_.erase(subtexts_.begin());
       icons_.erase(icons_.begin());
       identifiers_.erase(identifiers_.begin());
     }
 
      // The popup contents have changed, so either update the bounds or hide it.
     if (HasSuggestions())
       UpdateBoundsAndRedrawPopup();
     else
       Hide();
 
     return;
   }
 
   // Add a separator if there are any other values.
   if (!identifiers_.empty() &&
-      identifiers_[0] != WebAutofillClient::MenuItemIDSeparator) {
+      identifiers_[0] != MenuItemIDSeparator) {

[Ilya Sherman, 2014/02/11 22:21:33]

nit: Looks like this line no longer needs to wrap.

[gnana, 2014/02/12 13:34:09]

Done.

     names_.insert(names_.begin(), base::string16());
     subtexts_.insert(subtexts_.begin(), base::string16());
     icons_.insert(icons_.begin(), base::string16());
-    identifiers_.insert(identifiers_.begin(),
-                        WebAutofillClient::MenuItemIDSeparator);
+    identifiers_.insert(identifiers_.begin(), MenuItemIDSeparator);
   }
 
 
   names_.insert(names_.begin(), values.begin(), values.end());
   subtexts_.insert(subtexts_.begin(), labels.begin(), labels.end());
 
   // Add the values that are the same for all data list elements.
   icons_.insert(icons_.begin(), values.size(), base::string16());
   identifiers_.insert(identifiers_.begin(),
-                      values.size(),
-                      WebAutofillClient::MenuItemIDDataListEntry);
+                            values.size(),

[Evan Stade, 2014/02/11 18:56:39]

bad indent

[gnana, 2014/02/12 13:34:09]

Done.

+                            MenuItemIDDataListEntry);
 
   UpdateBoundsAndRedrawPopup();
 }
 
 void AutofillPopupControllerImpl::Hide() {
   controller_common_->RemoveKeyPressCallback();
   if (delegate_.get())
     delegate_->OnPopupHidden();
 
   if (view_)
@@ skipping 90 matching lines @@
   }
 
   return -1;
 }
 
 bool AutofillPopupControllerImpl::CanDelete(size_t index) const {
   // TODO(isherman): Native AddressBook suggestions on Mac and Android should
   // not be considered to be deleteable.
   int id = identifiers_[index];
   return id > 0 ||
-      id == WebAutofillClient::MenuItemIDAutocompleteEntry ||
-      id == WebAutofillClient::MenuItemIDPasswordEntry;
+      id == MenuItemIDAutocompleteEntry ||
+      id == MenuItemIDPasswordEntry;
 }
 
 bool AutofillPopupControllerImpl::IsWarning(size_t index) const {
-  return identifiers_[index] == WebAutofillClient::MenuItemIDWarningMessage;
+  return identifiers_[index] == MenuItemIDWarningMessage;
 }
 
 gfx::Rect AutofillPopupControllerImpl::GetRowBounds(size_t index) {
   int top = kPopupBorderThickness;
   for (size_t i = 0; i < index; ++i) {
     top += GetRowHeightFromId(identifiers()[i]);
   }
 
   return gfx::Rect(
       kPopupBorderThickness,
@@ skipping 40 matching lines @@
   return icons_;
 }
 
 const std::vector<int>& AutofillPopupControllerImpl::identifiers() const {
   return identifiers_;
 }
 
 #if !defined(OS_ANDROID)
 const gfx::FontList& AutofillPopupControllerImpl::GetNameFontListForRow(
     size_t index) const {
-  if (identifiers_[index] == WebAutofillClient::MenuItemIDWarningMessage)
+  if (identifiers_[index] == MenuItemIDWarningMessage)
     return warning_font_list_;
 
   return name_font_list_;
 }
 
 const gfx::FontList& AutofillPopupControllerImpl::subtext_font_list() const {
   return subtext_font_list_;
 }
 #endif
 
@@ skipping 109 matching lines @@
 
     if (y <= current_height)
       return i;
   }
 
   // The y value goes beyond the popup so stop the selection at the last line.
   return identifiers().size() - 1;
 }
 
 int AutofillPopupControllerImpl::GetRowHeightFromId(int identifier) const {
-  if (identifier == WebAutofillClient::MenuItemIDSeparator)
+  if (identifier == MenuItemIDSeparator)
     return kSeparatorHeight;
 
   return kRowHeight;
 }
 
 bool AutofillPopupControllerImpl::CanAccept(int id) {
-  return id != WebAutofillClient::MenuItemIDSeparator &&
-      id != WebAutofillClient::MenuItemIDWarningMessage;
+  return id != MenuItemIDSeparator &&

[Evan Stade, 2014/02/11 18:56:39]

unwrap?

[gnana, 2014/02/12 13:34:09]

Done.

+      id != MenuItemIDWarningMessage;
 }
 
 bool AutofillPopupControllerImpl::HasSuggestions() {
   return identifiers_.size() != 0 &&
       (identifiers_[0] > 0 ||
        identifiers_[0] ==

[Evan Stade, 2014/02/11 18:56:39]

un-wrap

[gnana, 2014/02/12 13:34:09]

Done.

-           WebAutofillClient::MenuItemIDAutocompleteEntry ||
-       identifiers_[0] == WebAutofillClient::MenuItemIDPasswordEntry ||
-       identifiers_[0] == WebAutofillClient::MenuItemIDDataListEntry);
+           MenuItemIDAutocompleteEntry ||
+       identifiers_[0] == MenuItemIDPasswordEntry ||
+       identifiers_[0] == MenuItemIDDataListEntry);
 }
 
 void AutofillPopupControllerImpl::SetValues(
     const std::vector<base::string16>& names,
     const std::vector<base::string16>& subtexts,
     const std::vector<base::string16>& icons,
     const std::vector<int>& identifiers) {
   names_ = names;
   full_names_ = names;
   subtexts_ = subtexts;
@@ skipping 81 matching lines @@
   names_.clear();
   subtexts_.clear();
   icons_.clear();
   identifiers_.clear();
   full_names_.clear();
 
   selected_line_ = kNoSelection;
 }
 
 }  // namespace autofill