summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-09 00:38:41 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-09 00:38:41 +0000
commit379e7a5a9b6934dca457eb3eaeb66a05a8946a8a (patch)
tree7fb61b6338cab5433fdf57517d9e56f23dac881c /ipc
parent0ef51cc6d25951d6dbaf4d8036d00b3316059ce9 (diff)
downloadchromium_src-379e7a5a9b6934dca457eb3eaeb66a05a8946a8a.zip
chromium_src-379e7a5a9b6934dca457eb3eaeb66a05a8946a8a.tar.gz
chromium_src-379e7a5a9b6934dca457eb3eaeb66a05a8946a8a.tar.bz2
base: string_util.h -> utf_string_conversions.h fix.
BUG=none TEST=none Review URL: http://codereview.chromium.org/678001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
-rw-r--r--ipc/ipc_message_utils.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h
index 670ce87..dd3d63e 100644
--- a/ipc/ipc_message_utils.h
+++ b/ipc/ipc_message_utils.h
@@ -5,6 +5,7 @@
#ifndef IPC_IPC_MESSAGE_UTILS_H_
#define IPC_IPC_MESSAGE_UTILS_H_
+#include <algorithm>
#include <string>
#include <vector>
#include <map>
@@ -14,6 +15,7 @@
#include "base/nullable_string16.h"
#include "base/string16.h"
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "base/time.h"
#include "base/tuple.h"
#include "base/values.h"
@@ -713,7 +715,7 @@ struct ParamTraits<base::FileDescriptor> {
}
}
};
-#endif // defined(OS_POSIX)
+#endif // defined(OS_POSIX)
// A ChannelHandle is basically a platform-inspecific wrapper around the
// fact that IPC endpoints are handled specially on POSIX. See above comments