diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 16:43:03 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 16:43:03 +0000 |
| commit | c6ac841f51c0b884b38e917ac30b1dfde0dc43a7 (patch) | |
| tree | 2b490ffa6795f72e7232d658b766785f0de64e38 /views/window | |
| parent | 6b32b95cff99ee72fd7824237ae5070263e5c496 (diff) | |
| download | chromium_src-c6ac841f51c0b884b38e917ac30b1dfde0dc43a7.zip chromium_src-c6ac841f51c0b884b38e917ac30b1dfde0dc43a7.tar.gz chromium_src-c6ac841f51c0b884b38e917ac30b1dfde0dc43a7.tar.bz2 | |
Rework gfx::Font by moving platform-specific code into inner classes.
gfx::Font is a platform-neutral API shim that exists as a wrapper object to allow for the creation and lifetime of gfx::Font objects to remain consistent with past usage.
gfx::PlatformFont is an interface implemented by the platform-specific inner classes (gfx::PlatformFontWin,Mac,Gtk).
BUG=none
TEST=existing unittests
Review URL: http://codereview.chromium.org/3083022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56040 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
| -rw-r--r-- | views/window/custom_frame_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc index ed83578..89d9491 100644 --- a/views/window/custom_frame_view.cc +++ b/views/window/custom_frame_view.cc @@ -280,7 +280,7 @@ int CustomFrameView::IconSize() const { // size are increased. return GetSystemMetrics(SM_CYSMICON); #else - return std::max(title_font_->height(), kIconMinimumSize); + return std::max(title_font_->GetHeight(), kIconMinimumSize); #endif } @@ -541,7 +541,7 @@ void CustomFrameView::LayoutTitleBar() { // Size the title. int title_x = d->ShouldShowWindowIcon() ? icon_bounds.right() + kIconTitleSpacing : icon_bounds.x(); - int title_height = title_font_->height(); + int title_height = title_font_->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 already |