diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 07:29:24 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 07:29:24 +0000 |
| commit | 3295612b187d98b8e64d508fc41595dcc614e8e8 (patch) | |
| tree | 00ae8d654e8c9102c6e15188a625ce57580f0e0c /content/browser/renderer_host/pepper | |
| parent | 0ea152b98ef30f08442d8f6c74c820f6d0db85bd (diff) | |
| download | chromium_src-3295612b187d98b8e64d508fc41595dcc614e8e8.zip chromium_src-3295612b187d98b8e64d508fc41595dcc614e8e8.tar.gz chromium_src-3295612b187d98b8e64d508fc41595dcc614e8e8.tar.bz2 | |
Update uses of UTF conversions in content/ to use the base:: namespace.
BUG=330556
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/121033002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/pepper')
| -rw-r--r-- | content/browser/renderer_host/pepper/pepper_truetype_font_list_win.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_list_win.cc b/content/browser/renderer_host/pepper/pepper_truetype_font_list_win.cc index 3530e1e..c52ee96 100644 --- a/content/browser/renderer_host/pepper/pepper_truetype_font_list_win.cc +++ b/content/browser/renderer_host/pepper/pepper_truetype_font_list_win.cc @@ -27,7 +27,7 @@ static int CALLBACK EnumFontFamiliesProc(ENUMLOGFONTEXW* logical_font, const LOGFONTW& lf = logical_font->elfLogFont; if (lf.lfFaceName[0] && lf.lfFaceName[0] != '@' && lf.lfOutPrecision == OUT_STROKE_PRECIS) { // Outline fonts only. - std::string face_name(UTF16ToUTF8(lf.lfFaceName)); + std::string face_name(base::UTF16ToUTF8(lf.lfFaceName)); font_families->push_back(face_name); } } @@ -44,7 +44,7 @@ static int CALLBACK EnumFontsInFamilyProc(ENUMLOGFONTEXW* logical_font, if (lf.lfFaceName[0] && lf.lfFaceName[0] != '@' && lf.lfOutPrecision == OUT_STROKE_PRECIS) { // Outline fonts only. ppapi::proxy::SerializedTrueTypeFontDesc desc; - desc.family = UTF16ToUTF8(lf.lfFaceName); + desc.family = base::UTF16ToUTF8(lf.lfFaceName); if (lf.lfItalic) desc.style = PP_TRUETYPEFONTSTYLE_ITALIC; desc.weight = static_cast<PP_TrueTypeFontWeight_Dev>(lf.lfWeight); @@ -73,7 +73,7 @@ void GetFontsInFamily_SlowBlocking(const std::string& family, LOGFONTW logfont; memset(&logfont, 0, sizeof(logfont)); logfont.lfCharSet = DEFAULT_CHARSET; - base::string16 family16 = UTF8ToUTF16(family); + base::string16 family16 = base::UTF8ToUTF16(family); memcpy(&logfont.lfFaceName, &family16[0], sizeof(logfont.lfFaceName)); base::win::ScopedCreateDC hdc(::CreateCompatibleDC(NULL)); ::EnumFontFamiliesExW(hdc, &logfont, (FONTENUMPROCW)&EnumFontsInFamilyProc, |