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

Unified Diff: content/browser/message_port_service.h

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/browser/media/webrtc_internals_message_handler.cc ('k') | content/browser/message_port_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/message_port_service.h
diff --git a/content/browser/message_port_service.h b/content/browser/message_port_service.h
index 55e536c1ddd7b474bc3bb492423d6cff5837de28..668959167f724e79ebfd914042438fb0128b5060 100644
--- a/content/browser/message_port_service.h
+++ b/content/browser/message_port_service.h
@@ -19,7 +19,8 @@ class MessagePortMessageFilter;
class MessagePortService {
public:
- typedef std::vector<std::pair<string16, std::vector<int> > > QueuedMessages;
+ typedef std::vector<std::pair<base::string16, std::vector<int> > >
+ QueuedMessages;
// Returns the MessagePortService singleton.
static MessagePortService* GetInstance();
@@ -31,7 +32,7 @@ class MessagePortService {
void Destroy(int message_port_id);
void Entangle(int local_message_port_id, int remote_message_port_id);
void PostMessage(int sender_message_port_id,
- const string16& message,
+ const base::string16& message,
const std::vector<int>& sent_message_port_ids);
void QueueMessages(int message_port_id);
void SendQueuedMessages(int message_port_id,
@@ -56,7 +57,7 @@ class MessagePortService {
~MessagePortService();
void PostMessageTo(int message_port_id,
- const string16& message,
+ const base::string16& message,
const std::vector<int>& sent_message_port_ids);
// Handles the details of removing a message port id. Before calling this,
« no previous file with comments | « content/browser/media/webrtc_internals_message_handler.cc ('k') | content/browser/message_port_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698