Index: chrome/browser/ui/autofill/autofill_popup_controller_impl.h |
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h |
index e3332b51f00d49f50a74b5c06df29046052c63ae..7a1fb0530e22a15d28313c90e20d96358a5d3fa5 100644 |
--- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h |
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h |
@@ -15,6 +15,7 @@ |
#include "chrome/browser/ui/autofill/autofill_popup_controller.h" |
#include "chrome/browser/ui/autofill/autofill_popup_layout_model.h" |
#include "chrome/browser/ui/autofill/popup_controller_common.h" |
+#include "ui/accessibility/ax_enums.h" |
#include "ui/gfx/geometry/rect.h" |
#include "ui/gfx/geometry/rect_f.h" |
#include "ui/native_theme/native_theme.h" |
@@ -72,11 +73,9 @@ class AutofillPopupControllerImpl : public AutofillPopupController { |
~AutofillPopupControllerImpl() override; |
// AutofillPopupViewDelegate implementation. |
- void UpdateBoundsAndRedrawPopup() override; |
void SetSelectionAtPoint(const gfx::Point& point) override; |
bool AcceptSelectedLine() override; |
void SelectionCleared() override; |
- void AcceptSuggestion(size_t index) override; |
gfx::Rect popup_bounds() const override; |
gfx::NativeView container_view() override; |
const gfx::RectF& element_bounds() const override; |
@@ -88,6 +87,8 @@ class AutofillPopupControllerImpl : public AutofillPopupController { |
#endif |
// AutofillPopupController implementation. |
+ void OnSuggestionsChanged() override; |
+ void AcceptSuggestion(size_t index) override; |
size_t GetLineCount() const override; |
const autofill::Suggestion& GetSuggestionAt(size_t row) const override; |
const base::string16& GetElidedValueAt(size_t row) const override; |
@@ -126,10 +127,6 @@ class AutofillPopupControllerImpl : public AutofillPopupController { |
AutofillPopupView* view() { return view_; } |
- // |view_| pass throughs (virtual for testing). |
- virtual void ShowView(); |
- virtual void InvalidateRow(size_t row); |
- |
base::WeakPtr<AutofillPopupControllerImpl> GetWeakPtr(); |
// Contains common popup functionality such as popup layout. Protected for |
@@ -139,7 +136,6 @@ class AutofillPopupControllerImpl : public AutofillPopupController { |
private: |
#if !defined(OS_ANDROID) |
FRIEND_TEST_ALL_PREFIXES(AutofillPopupControllerUnitTest, ElideText); |
- |
// Helper method which elides the value and label for the suggestion at |row| |
// given the |available_width|. Puts the results in |elided_values_| and |
// |elided_labels_|. |
@@ -150,6 +146,9 @@ class AutofillPopupControllerImpl : public AutofillPopupController { |
// when the popup is reused it doesn't leak values between uses. |
void ClearState(); |
+ friend class AutofillPopupControllerUnitTest; |
+ void SetViewForTesting(AutofillPopupView* view) { view_ = view; } |
+ |
AutofillPopupView* view_; // Weak reference. |
AutofillPopupLayoutModel layout_model_; |
base::WeakPtr<AutofillPopupDelegate> delegate_; |