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

Unified Diff: content/renderer/media/user_media_client_impl.cc

Issue 2537953003: WebString: makes string16 conversions explicit (part 1: blink, content) (Closed)
Patch Set: fix Created 4 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/renderer/media/rtc_peer_connection_handler.cc ('k') | content/renderer/menu_item_builder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/user_media_client_impl.cc
diff --git a/content/renderer/media/user_media_client_impl.cc b/content/renderer/media/user_media_client_impl.cc
index 2381c460580c126d7733acfb87bcaf6e1a154aa6..a98afe494c98b5592142e42732c7cf9dd1785f4d 100644
--- a/content/renderer/media/user_media_client_impl.cc
+++ b/content/renderer/media/user_media_client_impl.cc
@@ -469,7 +469,7 @@ void UserMediaClientImpl::OnStreamGenerated(
CreateVideoTracks(video_array, video_constraints, &video_track_vector,
request_info);
- blink::WebString webkit_id = base::UTF8ToUTF16(label);
+ blink::WebString webkit_id = blink::WebString::fromUTF8(label);
blink::WebMediaStream* web_stream = &(request_info->web_stream);
web_stream->initialize(webkit_id, audio_track_vector,
@@ -580,11 +580,9 @@ void UserMediaClientImpl::InitializeSourceObject(
return;
}
- webkit_source->initialize(
- base::UTF8ToUTF16(device.device.id),
- type,
- base::UTF8ToUTF16(device.device.name),
- false /* remote */);
+ webkit_source->initialize(blink::WebString::fromUTF8(device.device.id), type,
+ blink::WebString::fromUTF8(device.device.name),
+ false /* remote */);
DVLOG(1) << "Initialize source object :"
<< "id = " << webkit_source->id().utf8()
« no previous file with comments | « content/renderer/media/rtc_peer_connection_handler.cc ('k') | content/renderer/menu_item_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698