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

Side by Side Diff: content/browser/media/webrtc_internals_message_handler.cc

Issue 102593002: Convert string16 to base::string16 in content. (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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/media/webrtc_internals_message_handler.h" 5 #include "content/browser/media/webrtc_internals_message_handler.h"
6 6
7 #include "content/browser/media/webrtc_internals.h" 7 #include "content/browser/media/webrtc_internals.h"
8 #include "content/common/media/peer_connection_tracker_messages.h" 8 #include "content/common/media/peer_connection_tracker_messages.h"
9 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
10 #include "content/public/browser/render_process_host.h" 10 #include "content/public/browser/render_process_host.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 void WebRTCInternalsMessageHandler::OnStopRtpRecording( 61 void WebRTCInternalsMessageHandler::OnStopRtpRecording(
62 const base::ListValue* list) { 62 const base::ListValue* list) {
63 WebRTCInternals::GetInstance()->StopRtpRecording(); 63 WebRTCInternals::GetInstance()->StopRtpRecording();
64 } 64 }
65 65
66 void WebRTCInternalsMessageHandler::OnUpdate(const std::string& command, 66 void WebRTCInternalsMessageHandler::OnUpdate(const std::string& command,
67 const base::Value* args) { 67 const base::Value* args) {
68 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 68 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
69 std::vector<const base::Value*> args_vector; 69 std::vector<const base::Value*> args_vector;
70 args_vector.push_back(args); 70 args_vector.push_back(args);
71 string16 update = WebUI::GetJavascriptCall(command, args_vector); 71 base::string16 update = WebUI::GetJavascriptCall(command, args_vector);
72 72
73 RenderViewHost* host = web_ui()->GetWebContents()->GetRenderViewHost(); 73 RenderViewHost* host = web_ui()->GetWebContents()->GetRenderViewHost();
74 if (host) 74 if (host)
75 host->ExecuteJavascriptInWebFrame(string16(), update); 75 host->ExecuteJavascriptInWebFrame(base::string16(), update);
76 } 76 }
77 77
78 } // namespace content 78 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/webrtc_internals_browsertest.cc ('k') | content/browser/message_port_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698