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 3b9a6b73f2a317b3a4219102a8ac8485ec734a72..e9621e7799b6ea2721817e38d8b5754176e85fd4 100644 |
| --- a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.h |
| +++ b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.h |
| @@ -44,6 +44,10 @@ class AutocompleteResultView : public views::View { |
| // the match so that we can continue to paint the last result even after the |
| // model has changed. |
| void set_match(const AutocompleteMatch& match) { match_ = match; } |
| + gfx::Font normal_font() const { return normal_font_; } |
|
oshima
2011/02/16 20:00:27
const gfx::Font& same for the rest.
varunjain
2011/02/16 23:12:37
Done.
|
| + gfx::Font bold_font() const { return bold_font_; } |
| + gfx::Rect text_bounds() const { return text_bounds_; } |
| + void set_text_bounds(const gfx::Rect& tb) { text_bounds_ = tb; } |
| // Overridden from views::View: |
| virtual void OnPaint(gfx::Canvas* canvas); |
| @@ -54,12 +58,24 @@ class AutocompleteResultView : public views::View { |
| int GetPreferredHeight(const gfx::Font& font, |
| const gfx::Font& bold_font); |
| static SkColor GetColor(ResultViewState state, ColorKind kind); |
| + static int icon_size_; |
|
oshima
2011/02/16 20:00:27
is this const? yes, remove _ and use const naming.
varunjain
2011/02/16 23:12:37
not a const
|
| protected: |
| virtual void PaintMatch(gfx::Canvas* canvas, |
| const AutocompleteMatch& match, |
| int x); |
| + // Draws the specified |text| into the canvas, using highlighting provided by |
| + // |classifications|. If |force_dim| is true, ACMatchClassification::DIM is |
| + // added to all of the classifications. Returns the x position to the right |
| + // of the string. |
| + int DrawString(gfx::Canvas* canvas, |
| + const string16& text, |
| + const ACMatchClassifications& classifications, |
| + bool force_dim, |
| + int x, |
| + int y); |
| + |
| int icon_vertical_padding_; |
| int text_vertical_padding_; |
| @@ -96,17 +112,6 @@ class AutocompleteResultView : public views::View { |
| const SkBitmap* GetIcon() const; |
| - // Draws the specified |text| into the canvas, using highlighting provided by |
| - // |classifications|. If |force_dim| is true, ACMatchClassification::DIM is |
| - // added to all of the classifications. Returns the x position to the right |
| - // of the string. |
| - int DrawString(gfx::Canvas* canvas, |
| - const string16& text, |
| - const ACMatchClassifications& classifications, |
| - bool force_dim, |
| - int x, |
| - int y); |
| - |
| // Elides |runs| to fit in |remaining_width|. The runs in |runs| should be in |
| // logical order. |
| // |
| @@ -141,8 +146,6 @@ class AutocompleteResultView : public views::View { |
| gfx::Rect icon_bounds_; |
| gfx::Rect text_bounds_; |
| - static int icon_size_; |
| - |
| AutocompleteMatch match_; |
| DISALLOW_COPY_AND_ASSIGN(AutocompleteResultView); |