diff options
Diffstat (limited to 'chromium/ui/views/controls/table/table_header.h')
| -rw-r--r-- | chromium/ui/views/controls/table/table_header.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/ui/views/controls/table/table_header.h b/chromium/ui/views/controls/table/table_header.h index 2aa280d2d92..a595de949c6 100644 --- a/chromium/ui/views/controls/table/table_header.h +++ b/chromium/ui/views/controls/table/table_header.h @@ -5,7 +5,7 @@ #ifndef UI_VIEWS_CONTROLS_TABLE_TABLE_HEADER_H_ #define UI_VIEWS_CONTROLS_TABLE_TABLE_HEADER_H_ -#include "ui/gfx/font.h" +#include "ui/gfx/font_list.h" #include "ui/views/view.h" #include "ui/views/views_export.h" @@ -25,12 +25,12 @@ class VIEWS_EXPORT TableHeader : public views::View { explicit TableHeader(TableView* table); virtual ~TableHeader(); - const gfx::Font& font() const { return font_; } + const gfx::FontList& font_list() const { return font_list_; } // views::View overrides. virtual void Layout() OVERRIDE; virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; - virtual gfx::Size GetPreferredSize() OVERRIDE; + virtual gfx::Size GetPreferredSize() const OVERRIDE; virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) OVERRIDE; virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; @@ -70,7 +70,7 @@ class VIEWS_EXPORT TableHeader : public views::View { bool is_resizing() const { return resize_details_.get() != NULL; } - const gfx::Font font_; + const gfx::FontList font_list_; TableView* table_; |