| Index: chrome/browser/ui/views/omnibox/omnibox_result_view.h
|
| diff --git a/chrome/browser/ui/views/omnibox/omnibox_result_view.h b/chrome/browser/ui/views/omnibox/omnibox_result_view.h
|
| index 985335373965ea4040dbed02661f97848d837566..a6dadea9c6efec18853df843e0ddb948758fc906 100644
|
| --- a/chrome/browser/ui/views/omnibox/omnibox_result_view.h
|
| +++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.h
|
| @@ -17,6 +17,7 @@
|
| #include "ui/views/view.h"
|
|
|
| class OmniboxResultViewModel;
|
| +class OmniboxViewDelegate;
|
|
|
| namespace gfx {
|
| class Canvas;
|
| @@ -46,7 +47,7 @@ class OmniboxResultView : public views::View,
|
|
|
| OmniboxResultView(OmniboxResultViewModel* model,
|
| int model_index,
|
| - views::View* location_bar,
|
| + OmniboxViewDelegate* view_delegate,
|
| const gfx::Font& font);
|
| virtual ~OmniboxResultView();
|
|
|
| @@ -66,15 +67,15 @@ class OmniboxResultView : public views::View,
|
|
|
| ResultViewState GetState() const;
|
|
|
| + // 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;
|
| +
|
| protected:
|
| virtual void PaintMatch(gfx::Canvas* canvas,
|
| const AutocompleteMatch& match,
|
| int x);
|
|
|
| - // 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;
|
| -
|
| // 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
|
| @@ -145,7 +146,7 @@ class OmniboxResultView : public views::View,
|
| OmniboxResultViewModel* model_;
|
| size_t model_index_;
|
|
|
| - views::View* location_bar_;
|
| + OmniboxViewDelegate* view_delegate_;
|
|
|
| const gfx::Font font_;
|
| int font_height_;
|
|
|