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

Side by Side Diff: ui/gfx/font.cc

Issue 79263004: Enables font-related unittests again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Synced. Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gfx/font.h ('k') | ui/gfx/font_list_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/font.h" 5 #include "ui/gfx/font.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "ui/gfx/platform_font.h" 8 #include "ui/gfx/platform_font.h"
9 9
10 namespace gfx { 10 namespace gfx {
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 } 71 }
72 72
73 int Font::GetStyle() const { 73 int Font::GetStyle() const {
74 return platform_font_->GetStyle(); 74 return platform_font_->GetStyle();
75 } 75 }
76 76
77 std::string Font::GetFontName() const { 77 std::string Font::GetFontName() const {
78 return platform_font_->GetFontName(); 78 return platform_font_->GetFontName();
79 } 79 }
80 80
81 std::string Font::GetActualFontNameForTesting() const {
82 return platform_font_->GetActualFontNameForTesting();
83 }
84
81 int Font::GetFontSize() const { 85 int Font::GetFontSize() const {
82 return platform_font_->GetFontSize(); 86 return platform_font_->GetFontSize();
83 } 87 }
84 88
85 NativeFont Font::GetNativeFont() const { 89 NativeFont Font::GetNativeFont() const {
86 return platform_font_->GetNativeFont(); 90 return platform_font_->GetNativeFont();
87 } 91 }
88 92
89 } // namespace gfx 93 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/font.h ('k') | ui/gfx/font_list_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698