From fcf75d4016c7a2dcad1d2415009eff1e0eef4468 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Date: Tue, 3 Dec 2013 20:11:26 +0000 Subject: Convert string16 to base::string16 in content. BUG= Review URL: https://codereview.chromium.org/102593002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238447 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/message_port_service.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'content/browser/message_port_service.cc') diff --git a/content/browser/message_port_service.cc b/content/browser/message_port_service.cc index bc2a1ac..0d9f608 100644 --- a/content/browser/message_port_service.cc +++ b/content/browser/message_port_service.cc @@ -108,7 +108,7 @@ void MessagePortService::Entangle(int local_message_port_id, void MessagePortService::PostMessage( int sender_message_port_id, - const string16& message, + const base::string16& message, const std::vector<int>& sent_message_port_ids) { if (!message_ports_.count(sender_message_port_id)) { NOTREACHED(); @@ -130,7 +130,7 @@ void MessagePortService::PostMessage( void MessagePortService::PostMessageTo( int message_port_id, - const string16& message, + const base::string16& message, const std::vector<int>& sent_message_port_ids) { if (!message_ports_.count(message_port_id)) { NOTREACHED(); -- cgit v1.1