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

Unified Diff: content/common/clipboard_messages.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/common/android/address_parser_unittest.cc ('k') | content/common/database_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/clipboard_messages.h
diff --git a/content/common/clipboard_messages.h b/content/common/clipboard_messages.h
index 60ce68078a7b01e29ce8f139d61a67635fd7fa76..d212638ee67764f54cf25c2a2bdeed3c4378dfbc 100644
--- a/content/common/clipboard_messages.h
+++ b/content/common/clipboard_messages.h
@@ -56,17 +56,17 @@ IPC_MESSAGE_CONTROL1(ClipboardHostMsg_Clear,
ui::ClipboardType /* type */)
IPC_SYNC_MESSAGE_CONTROL1_2(ClipboardHostMsg_ReadAvailableTypes,
ui::ClipboardType /* type */,
- std::vector<string16> /* types */,
+ std::vector<base::string16> /* types */,
bool /* contains filenames */)
IPC_SYNC_MESSAGE_CONTROL1_1(ClipboardHostMsg_ReadText,
ui::ClipboardType /* type */,
- string16 /* result */)
+ base::string16 /* result */)
IPC_SYNC_MESSAGE_CONTROL1_1(ClipboardHostMsg_ReadAsciiText,
ui::ClipboardType /* type */,
std::string /* result */)
IPC_SYNC_MESSAGE_CONTROL1_4(ClipboardHostMsg_ReadHTML,
ui::ClipboardType /* type */,
- string16 /* markup */,
+ base::string16 /* markup */,
GURL /* url */,
uint32 /* fragment start */,
uint32 /* fragment end */)
@@ -79,13 +79,13 @@ IPC_SYNC_MESSAGE_CONTROL1_2(ClipboardHostMsg_ReadImage,
uint32 /* image size */)
IPC_SYNC_MESSAGE_CONTROL2_1(ClipboardHostMsg_ReadCustomData,
ui::ClipboardType /* type */,
- string16 /* type */,
- string16 /* result */)
+ base::string16 /* type */,
+ base::string16 /* result */)
IPC_SYNC_MESSAGE_CONTROL1_1(ClipboardHostMsg_ReadData,
ui::Clipboard::FormatType /* format */,
std::string /* result */)
#if defined(OS_MACOSX)
IPC_MESSAGE_CONTROL1(ClipboardHostMsg_FindPboardWriteStringAsync,
- string16 /* text */)
+ base::string16 /* text */)
#endif
« no previous file with comments | « content/common/android/address_parser_unittest.cc ('k') | content/common/database_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698