ui/views/controls/combobox/combobox.cc - Issue 1689623004: Start removing enum ui::ResourceBundle::FontStyle, fix MacViews font sizes

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: ui/views/controls/combobox/combobox.cc

Issue 1689623004: Start removing enum ui::ResourceBundle::FontStyle, fix MacViews font sizes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix transcription error Created 4 years, 10 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: ui/views/controls/combobox/combobox.cc

diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc

index 22512ea926c9607c8e663079041c636440412420..270bdd5e0c701eb0200df5929baf314a3158296a 100644

--- a/ui/views/controls/combobox/combobox.cc

+++ b/ui/views/controls/combobox/combobox.cc

@@ -12,6 +12,7 @@

#include "base/macros.h"

#include "build/build_config.h"

#include "ui/accessibility/ax_view_state.h"

+#include "ui/base/default_style.h"

#include "ui/base/ime/input_method.h"

#include "ui/base/models/combobox_model.h"

#include "ui/base/models/combobox_model_observer.h"

@@ -391,7 +392,7 @@ Combobox::~Combobox() {

// static

const gfx::FontList& Combobox::GetFontList() {

ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

- return rb.GetFontList(ui::ResourceBundle::BaseFont);

+ return rb.GetFontListWithDelta(ui::kLabelFontSizeDelta);

}

void Combobox::SetStyle(Style style) {

« no previous file with comments | « ui/views/bubble/bubble_frame_view.cc ('k') | ui/views/controls/label.cc » ('j') | no next file with comments »