summaryrefslogtreecommitdiffstats
path: root/ipc/ipc_message_utils.h
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-13 13:47:46 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-13 13:47:46 +0000
commit0238a162e012a8dc22d8eb58a05d25eaf8f47bec (patch)
tree94417c59c8732eb85e12c621af6b0af0ffbfd32e /ipc/ipc_message_utils.h
parent5bdc67b9478ad7bce05dc829c87852f8506dbf3d (diff)
downloadchromium_src-0238a162e012a8dc22d8eb58a05d25eaf8f47bec.zip
chromium_src-0238a162e012a8dc22d8eb58a05d25eaf8f47bec.tar.gz
chromium_src-0238a162e012a8dc22d8eb58a05d25eaf8f47bec.tar.bz2
Move nullable_string16.h to the string subdirectory.
BUG=247723 TEST=no change TBR=brettw@chromium.org Review URL: https://codereview.chromium.org/16415016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206066 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_message_utils.h')
-rw-r--r--ipc/ipc_message_utils.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h
index ac324e0..7fda943 100644
--- a/ipc/ipc_message_utils.h
+++ b/ipc/ipc_message_utils.h
@@ -45,12 +45,11 @@
#error "Please add the noinline property for your new compiler here."
#endif
-class NullableString16;
-
namespace base {
class DictionaryValue;
class FilePath;
class ListValue;
+class NullableString16;
class Time;
class TimeDelta;
class TimeTicks;
@@ -454,8 +453,8 @@ struct IPC_EXPORT ParamTraits<base::ListValue> {
};
template <>
-struct IPC_EXPORT ParamTraits<NullableString16> {
- typedef NullableString16 param_type;
+struct IPC_EXPORT ParamTraits<base::NullableString16> {
+ typedef base::NullableString16 param_type;
static void Write(Message* m, const param_type& p);
static bool Read(const Message* m, PickleIterator* iter,
param_type* r);