Chromium Code Reviews| Index: chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h |
| diff --git a/chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h b/chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h |
| index 1007499204d55846bee28c0782fe0291095a3eb1..0229c4b7e30565e04101ff72e7a08182e34bff6d 100644 |
| --- a/chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h |
| +++ b/chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h |
| @@ -28,6 +28,8 @@ class TouchAutocompleteResultView : public AutocompleteResultView { |
| const gfx::Font& font, |
| const gfx::Font& bold_font); |
| + using AutocompleteResultView::GetState; |
|
Peter Kasting
2012/05/04 23:33:31
Nit: I tend to prefer avoiding using statements, a
Jói
2012/05/04 23:52:19
This one is just to make the method public in this
|
| + |
| private: |
| virtual ~TouchAutocompleteResultView(); |
| @@ -36,6 +38,8 @@ class TouchAutocompleteResultView : public AutocompleteResultView { |
| const AutocompleteMatch& match, |
| int x) OVERRIDE; |
| virtual int GetTextHeight() const OVERRIDE; |
| + virtual void AdjustIconBounds(const AutocompleteMatch& match, |
| + gfx::Rect* bounds) OVERRIDE; |
| DISALLOW_COPY_AND_ASSIGN(TouchAutocompleteResultView); |
| }; |
| @@ -51,12 +55,10 @@ class TouchAutocompletePopupContentsView |
| // AutocompletePopupContentsView: |
| virtual void UpdatePopupAppearance() OVERRIDE; |
| - virtual void LayoutChildren() OVERRIDE; |
| protected: |
| // AutocompletePopupContentsView: |
| virtual void PaintResultViews(gfx::Canvas* canvas) OVERRIDE; |
| - virtual int CalculatePopupHeight() OVERRIDE; |
| virtual AutocompleteResultView* CreateResultView( |
| AutocompleteResultViewModel* model, |
| int model_index, |