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

Unified Diff: chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm

Issue 1819753003: Allow various font weights in gfx. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add a lost comment and modify a render text unittest to not test black because of test env font con… Created 4 years, 7 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/cocoa/omnibox/omnibox_popup_cell.mm
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm
index 7287734a46ce45d61fa7c4638080fac7d7dd4be4..456c5e4ad1edd5eeb5ef08e9c5e6f1163848660e 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm
@@ -132,16 +132,16 @@ NSColor* URLTextColor(BOOL is_dark_theme) {
}
NSFont* FieldFont() {
- return OmniboxViewMac::GetFieldFont(gfx::Font::NORMAL);
+ return OmniboxViewMac::GetNormalFieldFont();
}
NSFont* BoldFieldFont() {
- return OmniboxViewMac::GetFieldFont(gfx::Font::BOLD);
+ return OmniboxViewMac::GetBoldFieldFont();
}
NSFont* LargeFont() {
- return OmniboxViewMac::GetLargeFont(gfx::Font::NORMAL);
+ return OmniboxViewMac::GetLargeFont();
}
NSFont* LargeSuperscriptFont() {
- NSFont* font = OmniboxViewMac::GetLargeFont(gfx::Font::NORMAL);
+ NSFont* font = OmniboxViewMac::GetLargeFont();
// Calculate a slightly smaller font. The ratio here is somewhat arbitrary.
// Proportions from 5/9 to 5/7 all look pretty good.
CGFloat size = [font pointSize] * 5.0 / 9.0;
@@ -149,7 +149,7 @@ NSFont* LargeSuperscriptFont() {
return [NSFont fontWithDescriptor:descriptor size:size];
}
NSFont* SmallFont() {
- return OmniboxViewMac::GetSmallFont(gfx::Font::NORMAL);
+ return OmniboxViewMac::GetSmallFont();
}
CGFloat GetContentAreaWidth(NSRect cellFrame) {

Powered by Google App Engine
This is Rietveld 408576698