Uses child views in Autofill Popup so we can trigger

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/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
 #include "components/autofill/core/browser/autofill_popup_delegate.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/browser/suggestion.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
 
 using base::WeakPtr;
 
 namespace autofill {
 namespace {
 
-// Used to indicate that no line is currently selected by the user.
-const int kNoSelection = -1;
+const auto& kNoSelection = AutofillPopupView::kNoSelection;

[groby-ooo-7-16, 2017/03/20 20:42:55]

Why define a new constant here? (And if we must, please use constexpr)

[csashi, 2017/03/20 21:41:51]

I removed this a few patches ago. Can you please check the latest patch?

[groby-ooo-7-16, 2017/03/20 22:53:10]

Acknowledged.

 
 }  // namespace
 
 // static
 WeakPtr<AutofillPopupControllerImpl> AutofillPopupControllerImpl::GetOrCreate(
     WeakPtr<AutofillPopupControllerImpl> previous,
     WeakPtr<AutofillPopupDelegate> delegate,
     content::WebContents* web_contents,
     gfx::NativeView container_view,
     const gfx::RectF& element_bounds,
@@ skipping 65 matching lines @@
   // Elide the name and label strings so that the popup fits in the available
   // space.
   for (size_t i = 0; i < suggestions_.size(); ++i) {
     bool has_label = !suggestions_[i].label.empty();
     ElideValueAndLabelForRow(
         i, layout_model_.GetAvailableWidthForRow(i, has_label));
   }
 #endif
 
   if (just_created) {
-    ShowView();
+    view_->Show();
   } else {
-    UpdateBoundsAndRedrawPopup();
+    OnSuggestionsChanged();
   }
 
   controller_common_->RegisterKeyPressCallback();
   delegate_->OnPopupShown();
 
   DCHECK_EQ(suggestions_.size(), elided_values_.size());
   DCHECK_EQ(suggestions_.size(), elided_labels_.size());
 }
 
 void AutofillPopupControllerImpl::UpdateDataListValues(
@@ skipping 16 matching lines @@
   if (values.empty()) {
     if (!suggestions_.empty() &&
         suggestions_[0].frontend_id == POPUP_ITEM_ID_SEPARATOR) {
       suggestions_.erase(suggestions_.begin());
       elided_values_.erase(elided_values_.begin());
       elided_labels_.erase(elided_labels_.begin());
     }
 
      // The popup contents have changed, so either update the bounds or hide it.
     if (HasSuggestions())
-      UpdateBoundsAndRedrawPopup();
+      OnSuggestionsChanged();
     else
       Hide();
 
     return;
   }
 
   // Add a separator if there are any other values.
   if (!suggestions_.empty() &&
       suggestions_[0].frontend_id != POPUP_ITEM_ID_SEPARATOR) {
     suggestions_.insert(suggestions_.begin(), autofill::Suggestion());
@@ skipping 11 matching lines @@
   for (size_t i = 0; i < values.size(); i++) {
     suggestions_[i].value = values[i];
     suggestions_[i].label = labels[i];
     suggestions_[i].frontend_id = POPUP_ITEM_ID_DATALIST_ENTRY;
 
     // TODO(brettw) it looks like these should be elided.
     elided_values_[i] = values[i];
     elided_labels_[i] = labels[i];
   }
 
-  UpdateBoundsAndRedrawPopup();
+  OnSuggestionsChanged();
   DCHECK_EQ(suggestions_.size(), elided_values_.size());
   DCHECK_EQ(suggestions_.size(), elided_labels_.size());
 }
 
 void AutofillPopupControllerImpl::Hide() {
   controller_common_->RemoveKeyPressCallback();
   if (delegate_)
     delegate_->OnPopupHidden();
 
   if (view_)
@@ skipping 39 matching lines @@
       // location.
       AcceptSelectedLine();
       return false;
     case ui::VKEY_RETURN:
       return AcceptSelectedLine();
     default:
       return false;
   }
 }
 
-void AutofillPopupControllerImpl::UpdateBoundsAndRedrawPopup() {
+void AutofillPopupControllerImpl::OnSuggestionsChanged() {
 #if !defined(OS_ANDROID)
   // TODO(csharp): Since UpdatePopupBounds can change the position of the popup,
   // the popup could end up jumping from above the element to below it.
   // It is unclear if it is better to keep the popup where it was, or if it
   // should try and move to its desired position.
   layout_model_.UpdatePopupBounds();
 #endif
 
   // Platform-specific draw call.
-  view_->UpdateBoundsAndRedrawPopup();
+  view_->OnSuggestionsChanged();
 }
 
 void AutofillPopupControllerImpl::SetSelectionAtPoint(const gfx::Point& point) {
   SetSelectedLine(layout_model_.LineFromY(point.y()));
 }
 
 bool AutofillPopupControllerImpl::AcceptSelectedLine() {
   if (selected_line_ == kNoSelection)
     return false;
 
@@ skipping 90 matching lines @@
 
   // Remove the deleted element.
   suggestions_.erase(suggestions_.begin() + list_index);
   elided_values_.erase(elided_values_.begin() + list_index);
   elided_labels_.erase(elided_labels_.begin() + list_index);
 
   SetSelectedLine(kNoSelection);
 
   if (HasSuggestions()) {
     delegate_->ClearPreviewedForm();
-    UpdateBoundsAndRedrawPopup();
+    OnSuggestionsChanged();
   } else {
     Hide();
   }
 
   return true;
 }
 
 ui::NativeTheme::ColorId
 AutofillPopupControllerImpl::GetBackgroundColorIDForRow(int index) const {
   return index == selected_line_ ?
     ui::NativeTheme::kColorId_ResultsTableHoveredBackground :
     ui::NativeTheme::kColorId_ResultsTableNormalBackground;
 }
 
 int AutofillPopupControllerImpl::selected_line() const {
   return selected_line_;
 }
 
 const AutofillPopupLayoutModel& AutofillPopupControllerImpl::layout_model()
     const {
   return layout_model_;
 }
 
 void AutofillPopupControllerImpl::SetSelectedLine(int selected_line) {
   if (selected_line_ == selected_line)
     return;
 
-  if (selected_line_ != kNoSelection &&
-      static_cast<size_t>(selected_line_) < suggestions_.size())
-    InvalidateRow(selected_line_);
-
   if (selected_line != kNoSelection) {
-    InvalidateRow(selected_line);
-
+    DCHECK_GE(selected_line, 0);
+    DCHECK_LT(static_cast<size_t>(selected_line), suggestions_.size());
     if (!CanAccept(suggestions_[selected_line].frontend_id))
       selected_line = kNoSelection;
   }
 
+  view_->OnSelectedRowChanged(selected_line_, selected_line);
+
   selected_line_ = selected_line;
 
   if (selected_line_ != kNoSelection) {
     delegate_->DidSelectSuggestion(suggestions_[selected_line_].value,
                                    suggestions_[selected_line_].frontend_id);
   } else {
     delegate_->ClearPreviewedForm();
   }
 }
 
@@ skipping 57 matching lines @@
     const std::vector<autofill::Suggestion>& suggestions) {
   suggestions_ = suggestions;
   elided_values_.resize(suggestions.size());
   elided_labels_.resize(suggestions.size());
   for (size_t i = 0; i < suggestions.size(); i++) {
     elided_values_[i] = suggestions[i].value;
     elided_labels_[i] = suggestions[i].label;
   }
 }
 
-void AutofillPopupControllerImpl::ShowView() {
-  view_->Show();
-}
-
-void AutofillPopupControllerImpl::InvalidateRow(size_t row) {
-  DCHECK(0 <= row);
-  DCHECK(row < suggestions_.size());
-  view_->InvalidateRow(row);
-}
-
 WeakPtr<AutofillPopupControllerImpl> AutofillPopupControllerImpl::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 #if !defined(OS_ANDROID)
 void AutofillPopupControllerImpl::ElideValueAndLabelForRow(
     size_t row,
     int available_width) {
   int value_width = gfx::GetStringWidth(
       suggestions_[row].value, layout_model_.GetValueFontListForRow(row));
@@ skipping 23 matching lines @@
   // Don't clear view_, because otherwise the popup will have to get regenerated
   // and this will cause flickering.
   suggestions_.clear();
   elided_values_.clear();
   elided_labels_.clear();
 
   selected_line_ = kNoSelection;
 }
 
 }  // namespace autofill