Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1612)

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_result_view.h

Issue 19666006: Supports FontList in Textfield. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removes ResourceBundle::Delegate::GetFontList. Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 d426eab99576eefb931ee437979ba51c26b0b7ac..007407b441f5c793af0cd6aab8d2e347488d4607 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_result_view.h
+++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.h
@@ -11,7 +11,7 @@
#include "third_party/skia/include/core/SkColor.h"
#include "ui/base/animation/animation_delegate.h"
#include "ui/base/animation/slide_animation.h"
-#include "ui/gfx/font.h"
+#include "ui/gfx/font_list.h"
#include "ui/gfx/rect.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/view.h"
@@ -48,7 +48,7 @@ class OmniboxResultView : public views::View,
OmniboxResultView(OmniboxResultViewModel* model,
int model_index,
LocationBarView* location_bar_view,
- const gfx::Font& font);
+ const gfx::FontList& font_list);
virtual ~OmniboxResultView();
SkColor GetColor(ResultViewState state, ColorKind kind) const;
@@ -148,7 +148,7 @@ class OmniboxResultView : public views::View,
LocationBarView* location_bar_view_;
- const gfx::Font font_;
+ const gfx::FontList font_list_;
int font_height_;
// Width of the ellipsis in the normal font.

Powered by Google App Engine
This is Rietveld 408576698