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

Unified Diff: content/renderer/renderer_blink_platform_impl.cc

Issue 2656043002: Use explicit WebString conversions in remaining content files (Closed)
Patch Set: build fix Created 3 years, 11 months 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
Index: content/renderer/renderer_blink_platform_impl.cc
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index 1da9e4d4109ae47cf6343233bf56d4fb411df678..ac5c05a3ad6ead44cd27d80c77b792ed62a0c596 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -709,8 +709,7 @@ WebAudioDevice* RendererBlinkPlatformImpl::createAudioDevice(
int session_id = 0;
if (input_device_id.isNull() ||
- !base::StringToInt(base::UTF16ToUTF8(
- base::StringPiece16(input_device_id)), &session_id)) {
+ !base::StringToInt(input_device_id.utf8(), &session_id)) {
if (input_channels > 0)
DLOG(WARNING) << "createAudioDevice(): request for audio input ignored";
@@ -759,13 +758,14 @@ void RendererBlinkPlatformImpl::getPluginList(
RenderThread::Get()->Send(
new FrameHostMsg_GetPlugins(refresh, mainFrameOrigin, &plugins));
for (const WebPluginInfo& plugin : plugins) {
- builder->addPlugin(
- plugin.name, plugin.desc,
- plugin.path.BaseName().AsUTF16Unsafe());
+ builder->addPlugin(WebString::fromUTF16(plugin.name),
+ WebString::fromUTF16(plugin.desc),
+ blink::FilePathToWebString(plugin.path.BaseName()));
for (const WebPluginMimeType& mime_type : plugin.mime_types) {
builder->addMediaTypeToLastPlugin(
- WebString::fromUTF8(mime_type.mime_type), mime_type.description);
+ WebString::fromUTF8(mime_type.mime_type),
+ WebString::fromUTF16(mime_type.description));
for (const auto& extension : mime_type.file_extensions) {
builder->addFileExtensionToLastMediaType(
@@ -1107,7 +1107,7 @@ blink::WebCompositorSupport* RendererBlinkPlatformImpl::compositorSupport() {
blink::WebString RendererBlinkPlatformImpl::convertIDNToUnicode(
const blink::WebString& host) {
- return url_formatter::IDNToUnicode(host.utf8());
+ return WebString::fromUTF16(url_formatter::IDNToUnicode(host.utf8()));
}
//------------------------------------------------------------------------------

Powered by Google App Engine
This is Rietveld 408576698