| Index: chrome/browser/ui/views/omnibox/omnibox_view_win.h
|
| diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.h b/chrome/browser/ui/views/omnibox/omnibox_view_win.h
|
| index 7caecffb1e87e166e60bb99e6f69e9d744ff068f..89a91b6b6825d7905b000b2b85512c5cbc90568c 100644
|
| --- a/chrome/browser/ui/views/omnibox/omnibox_view_win.h
|
| +++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.h
|
| @@ -21,7 +21,7 @@
|
| #include "ui/base/models/simple_menu_model.h"
|
| #include "ui/base/win/extra_sdk_defines.h"
|
| #include "ui/base/window_open_disposition.h"
|
| -#include "ui/gfx/font.h"
|
| +#include "ui/gfx/font_list.h"
|
|
|
| class LocationBarView;
|
| class OmniboxPopupView;
|
| @@ -63,7 +63,7 @@ class OmniboxViewWin
|
| LocationBarView* parent_view,
|
| CommandUpdater* command_updater,
|
| bool popup_window_mode,
|
| - const gfx::Font& font,
|
| + const gfx::FontList& font_list,
|
| int font_y_offset);
|
| ~OmniboxViewWin();
|
|
|
| @@ -470,9 +470,8 @@ class OmniboxViewWin
|
| scoped_ptr<ui::SimpleMenuModel> context_menu_contents_;
|
| scoped_ptr<views::MenuRunner> context_menu_runner_;
|
|
|
| - // Font we're using. We keep a reference to make sure the font supplied to
|
| - // the constructor doesn't go away before we do.
|
| - gfx::Font font_;
|
| + // The font list to draw text in Omnibox.
|
| + gfx::FontList font_list_;
|
|
|
| // Metrics about the font, which we keep so we don't need to recalculate them
|
| // every time we paint. |font_y_adjustment_| is the number of pixels we need
|
|
|