chrome/browser/views/frame/opaque_browser_frame_view.cc - Issue 3083022: Rework gfx::Font by moving platform-specific code into inner classes....

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/views/frame/opaque_browser_frame_view.cc

Issue 3083022: Rework gfx::Font by moving platform-specific code into inner classes.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 10 years, 4 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/views/frame/app_panel_browser_frame_view.cc ('k') | chrome/browser/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/views/frame/opaque_browser_frame_view.cc

===================================================================

--- chrome/browser/views/frame/opaque_browser_frame_view.cc (revision 55911)

+++ chrome/browser/views/frame/opaque_browser_frame_view.cc (working copy)

@@ -508,7 +508,7 @@

// size are increased.

return GetSystemMetrics(SM_CYSMICON);

#else

- return std::max(BrowserFrame::GetTitleFont().height(), kIconMinimumSize);

+ return std::max(BrowserFrame::GetTitleFont().GetHeight(), kIconMinimumSize);

#endif

}

@@ -1017,7 +1017,7 @@

if (d->ShouldShowWindowTitle()) {

int title_x = d->ShouldShowWindowIcon() ?

icon_bounds.right() + kIconTitleSpacing : icon_bounds.x();

- int title_height = BrowserFrame::GetTitleFont().height();

+ int title_height = BrowserFrame::GetTitleFont().GetHeight();

// We bias the title position so that when the difference between the icon

// and title heights is odd, the extra pixel of the title is above the

// vertical midline rather than below. This compensates for how the icon is