diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 20:11:26 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 20:11:26 +0000 |
| commit | fcf75d4016c7a2dcad1d2415009eff1e0eef4468 (patch) | |
| tree | d41b14e6526a822b66d692f60dc8f648a2afb3cd /content/common/mac/font_descriptor.mm | |
| parent | 426d1c945bcb1a8479d92a7dd023c34cbbc7a261 (diff) | |
| download | chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.zip chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.gz chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.bz2 | |
Convert string16 to base::string16 in content.
BUG=
Review URL: https://codereview.chromium.org/102593002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/mac/font_descriptor.mm')
| -rw-r--r-- | content/common/mac/font_descriptor.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/common/mac/font_descriptor.mm b/content/common/mac/font_descriptor.mm index 3b5a577..e5c04c1 100644 --- a/content/common/mac/font_descriptor.mm +++ b/content/common/mac/font_descriptor.mm @@ -13,7 +13,7 @@ FontDescriptor::FontDescriptor(NSFont* font) { font_point_size = [font pointSize]; } -FontDescriptor::FontDescriptor(string16 name, float size) { +FontDescriptor::FontDescriptor(base::string16 name, float size) { font_name = name; font_point_size = size; } |