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..74b4a7239cb7d36862728e7d5be0e07996646e74 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(); |
@@ -472,7 +472,7 @@ class OmniboxViewWin |
// Font we're using. We keep a reference to make sure the font supplied to |
msw
2013/07/26 21:19:57
nit: I think the reference comment is misleading,
Yuki
2013/07/29 15:27:21
This comment seems being written when we were usin
|
// the constructor doesn't go away before we do. |
Peter Kasting
2013/07/26 20:54:27
Nit: Update comment
Yuki
2013/07/29 15:27:21
Done.
|
- gfx::Font font_; |
+ 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 |