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

Unified Diff: content/child/webmessageportchannel_impl.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/child/webmessageportchannel_impl.h ('k') | content/common/android/address_parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/webmessageportchannel_impl.cc
diff --git a/content/child/webmessageportchannel_impl.cc b/content/child/webmessageportchannel_impl.cc
index aeb847548a07c3f649010f66476f21d025108c17..7b0658ec665cd99d679ec989165269025fa2cfe3 100644
--- a/content/child/webmessageportchannel_impl.cc
+++ b/content/child/webmessageportchannel_impl.cc
@@ -202,7 +202,7 @@ bool WebMessagePortChannelImpl::OnMessageReceived(const IPC::Message& message) {
}
void WebMessagePortChannelImpl::OnMessage(
- const string16& message,
+ const base::string16& message,
const std::vector<int>& sent_message_port_ids,
const std::vector<int>& new_routing_ids) {
base::AutoLock auto_lock(lock_);
@@ -230,7 +230,7 @@ void WebMessagePortChannelImpl::OnMessagesQueued() {
base::AutoLock auto_lock(lock_);
queued_messages.reserve(message_queue_.size());
while (!message_queue_.empty()) {
- string16 message = message_queue_.front().message;
+ base::string16 message = message_queue_.front().message;
const std::vector<WebMessagePortChannelImpl*>& channel_array =
message_queue_.front().ports;
std::vector<int> port_ids(channel_array.size());
« no previous file with comments | « content/child/webmessageportchannel_impl.h ('k') | content/common/android/address_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698