chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_view.h - Issue 19666006: Supports FontList in Textfield.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_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

« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_views.cc ('k') | chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_view.cc » ('j') | ui/base/resource/resource_bundle.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_view.h

diff --git a/chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_view.h b/chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_view.h

index 75cdad01cbc6126d06190b27e522d7c8de2af475..e87745cf6d625355798e5cef14ddd853da3c704f 100644

--- a/chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_view.h

+++ b/chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_view.h

@@ -25,7 +25,7 @@ class TouchOmniboxResultView : public OmniboxResultView {

TouchOmniboxResultView(OmniboxResultViewModel* model,

int model_index,

LocationBarView* location_bar_view,

- const gfx::Font& font);

+ const gfx::FontList& font_list);

private:

virtual ~TouchOmniboxResultView();

@@ -42,7 +42,7 @@ class TouchOmniboxResultView : public OmniboxResultView {

class TouchOmniboxPopupContentsView

: public OmniboxPopupContentsView {

public:

- TouchOmniboxPopupContentsView(const gfx::Font& font,

+ TouchOmniboxPopupContentsView(const gfx::FontList& font_list,

OmniboxView* omnibox_view,

OmniboxEditModel* edit_model,

LocationBarView* location_bar_view);

@@ -54,9 +54,10 @@ class TouchOmniboxPopupContentsView

protected:

// OmniboxPopupContentsView:

virtual void PaintResultViews(gfx::Canvas* canvas) OVERRIDE;

- virtual OmniboxResultView* CreateResultView(OmniboxResultViewModel* model,

- int model_index,

- const gfx::Font& font) OVERRIDE;

+ virtual OmniboxResultView* CreateResultView(

+ OmniboxResultViewModel* model,

+ int model_index,

+ const gfx::FontList& font_list) OVERRIDE;

private:

std::vector<View*> GetVisibleChildren();