Chromium Code Reviews| Index: chrome/browser/ui/views/autocomplete/autocomplete_result_view.h |
| diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.h b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.h |
| index 7d79dfde481b39f53735fe7111b72d6bccf1dac7..80ad08dd519a024664558cce37c743b0b8f1993e 100644 |
| --- a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.h |
| +++ b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.h |
| @@ -60,10 +60,18 @@ class AutocompleteResultView : public views::View, |
| virtual gfx::Size GetPreferredSize() OVERRIDE; |
| protected: |
| + ResultViewState GetState() const; |
| + |
| virtual void PaintMatch(gfx::Canvas* canvas, |
| const AutocompleteMatch& match, |
| int x); |
| + // The base class never adjusts the bounds for the icon. Subclasses |
| + // may adjust them e.g. if they are using a multi-line or horizontal |
| + // layout. |
| + virtual void AdjustIconBounds(const AutocompleteMatch& match, |
| + gfx::Rect* bounds); |
| + |
| // Returns the height of the text portion of the result view. In the base |
| // class, this is the height of one line of text. |
| virtual int GetTextHeight() const; |
| @@ -81,6 +89,11 @@ class AutocompleteResultView : public views::View, |
| const gfx::Rect& text_bounds() const { return text_bounds_; } |
| + // Default values cached here, may be overridden by subclasses. |
|
Peter Kasting
2012/05/04 23:33:31
Nit: The Google style guide says to use overrideab
Jói
2012/05/04 23:52:19
Wanted to avoid the virtual methods since these ge
Jói
2012/05/07 16:26:18
Done.
|
| + int edge_item_padding_; |
| + int item_padding_; |
| + int minimum_text_vertical_padding_; |
| + |
| private: |
| struct ClassificationData; |
| typedef std::vector<ClassificationData> Classifications; |
| @@ -92,7 +105,6 @@ class AutocompleteResultView : public views::View, |
| static bool SortRunsLogically(const RunData& lhs, const RunData& rhs); |
| static bool SortRunsVisually(const RunData& lhs, const RunData& rhs); |
| - ResultViewState GetState() const; |
| const SkBitmap* GetIcon() const; |
| const SkBitmap* GetKeywordIcon() const; |