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 535b8e028bdc35a964d1401f3559e88e2d6a9ba8..525ddada6cdd112d89b4c19f39032f225404b439 100644 |
--- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h |
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h |
@@ -83,9 +83,9 @@ class AutofillPopupControllerImpl : public AutofillPopupController { |
// AutofillPopupController implementation. |
virtual void UpdateBoundsAndRedrawPopup() OVERRIDE; |
- virtual void MouseHovered(int x, int y) OVERRIDE; |
- virtual void MouseClicked(int x, int y) OVERRIDE; |
- virtual void MouseExitedPopup() OVERRIDE; |
+ virtual void PointPreselected(int x, int y) OVERRIDE; |
+ virtual void PointSelected(int x, int y) OVERRIDE; |
+ virtual void PreselectionCleared() OVERRIDE; |
virtual bool ShouldRepostEvent(const ui::MouseEvent& event) OVERRIDE; |
virtual void AcceptSuggestion(size_t index) OVERRIDE; |
virtual int GetIconResourceID(const string16& resource_name) OVERRIDE; |
@@ -106,23 +106,23 @@ class AutofillPopupControllerImpl : public AutofillPopupController { |
virtual const gfx::Font& GetNameFontForRow(size_t index) const OVERRIDE; |
virtual const gfx::Font& subtext_font() const OVERRIDE; |
#endif |
- virtual int selected_line() const OVERRIDE; |
+ virtual int preselected_line() const OVERRIDE; |
virtual bool hide_on_outside_click() const OVERRIDE; |
- // Change which line is currently selected by the user. |
- void SetSelectedLine(int selected_line); |
+ // Change which line is currently preselected by the user. |
+ void SetPreselectedLine(int preselected_line); |
- // Increase the selected line by 1, properly handling wrapping. |
- void SelectNextLine(); |
+ // Increase the preselected line by 1, properly handling wrapping. |
+ void PreselectNextLine(); |
- // Decrease the selected line by 1, properly handling wrapping. |
- void SelectPreviousLine(); |
+ // Decrease the preselected line by 1, properly handling wrapping. |
+ void PreselectPreviousLine(); |
- // The user has choosen the selected line. |
- bool AcceptSelectedLine(); |
+ // The user has chosen the preselected line. |
+ bool AcceptPreselectedLine(); |
// The user has removed a suggestion. |
- bool RemoveSelectedLine(); |
+ bool RemovePreselectedLine(); |
// Convert a y-coordinate to the closest line. |
int LineFromY(int y); |
@@ -226,9 +226,9 @@ class AutofillPopupControllerImpl : public AutofillPopupController { |
gfx::Font warning_font_; |
#endif |
- // The line that is currently selected by the user. |
- // |kNoSelection| indicates that no line is currently selected. |
- int selected_line_; |
+ // The line that is currently preselected by the user. |
+ // |kNoPreselection| indicates that no line is currently preselected. |
+ int preselected_line_; |
// Whether the popup view should hide on mouse presses outside of it. |
bool hide_on_outside_click_; |