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

Unified Diff: content/child/browser_font_resource_trusted.cc

Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/worker_host/worker_process_host.cc ('k') | content/child/child_process.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/browser_font_resource_trusted.cc
diff --git a/content/child/browser_font_resource_trusted.cc b/content/child/browser_font_resource_trusted.cc
index be4a8b618b5b1acacbb942740dd34073935c0100..39746a82fc5af620df2465a76a5833427817415e 100644
--- a/content/child/browser_font_resource_trusted.cc
+++ b/content/child/browser_font_resource_trusted.cc
@@ -65,7 +65,7 @@ class TextRunCollection {
StringVar* text_string = StringVar::FromPPVar(run.text);
if (!text_string)
return; // Leave num_runs_ = 0 so we'll do nothing.
- text_ = UTF8ToUTF16(text_string->value());
+ text_ = base::UTF8ToUTF16(text_string->value());
if (run.override_direction) {
// Skip autodetection.
@@ -127,7 +127,7 @@ bool PPTextRunToWebTextRun(const PP_BrowserFont_Trusted_TextRun& text,
if (!text_string)
return false;
- *run = WebTextRun(UTF8ToUTF16(text_string->value()),
+ *run = WebTextRun(base::UTF8ToUTF16(text_string->value()),
PP_ToBool(text.rtl),
PP_ToBool(text.override_direction));
return true;
@@ -191,7 +191,7 @@ WebFontDescription PPFontDescToWebFontDesc(
}
} else {
// Use the exact font.
- resolved_family = UTF8ToUTF16(face_name->value());
+ resolved_family = base::UTF8ToUTF16(face_name->value());
}
result.family = resolved_family;
@@ -273,7 +273,8 @@ PP_Bool BrowserFontResource_Trusted::Describe(
// While converting the other way in PPFontDescToWebFontDesc we validated
// that the enums can be casted.
WebFontDescription web_desc = font_->fontDescription();
- description->face = StringVar::StringToPPVar(UTF16ToUTF8(web_desc.family));
+ description->face =
+ StringVar::StringToPPVar(base::UTF16ToUTF8(web_desc.family));
description->family =
static_cast<PP_BrowserFont_Trusted_Family>(web_desc.genericFamily);
description->size = static_cast<uint32_t>(web_desc.size);
« no previous file with comments | « content/browser/worker_host/worker_process_host.cc ('k') | content/child/child_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698