diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 16:24:45 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 16:24:45 +0000 |
| commit | 76fcc3e9dc467366b9d1938834d7faff595ab873 (patch) | |
| tree | dcfc78d6c356be77a902a3fe5e59a6590fe7521e /gfx/font.cc | |
| parent | 3a742fcae0c094dd1ea11354fb3dcfe9ccc07a73 (diff) | |
| download | chromium_src-76fcc3e9dc467366b9d1938834d7faff595ab873.zip chromium_src-76fcc3e9dc467366b9d1938834d7faff595ab873.tar.gz chromium_src-76fcc3e9dc467366b9d1938834d7faff595ab873.tar.bz2 | |
Revert 71169 - Revert 71167 - Remove wstring from gfx.
BUG=68882
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6121004
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/6134010
TBR=joi@chromium.org
Review URL: http://codereview.chromium.org/6130008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx/font.cc')
| -rw-r--r-- | gfx/font.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gfx/font.cc b/gfx/font.cc index 6897022..8b8241d 100644 --- a/gfx/font.cc +++ b/gfx/font.cc @@ -30,7 +30,7 @@ Font::Font(NativeFont native_font) Font::Font(PlatformFont* platform_font) : platform_font_(platform_font) { } -Font::Font(const std::wstring& font_name, int font_size) +Font::Font(const string16& font_name, int font_size) : platform_font_(PlatformFont::CreateFromNameAndSize(font_name, font_size)) { } @@ -70,7 +70,7 @@ int Font::GetStyle() const { return platform_font_->GetStyle(); } -const std::wstring& Font::GetFontName() const { +string16 Font::GetFontName() const { return platform_font_->GetFontName(); } |