summaryrefslogtreecommitdiffstats
path: root/ipc/ipc_channel.h
diff options
context:
space:
mode:
authorbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-28 21:46:01 +0000
committerbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-28 21:46:01 +0000
commitbccbaf25ab40103942e680a95cd7ccc4ffa1adb1 (patch)
tree4b53507e6e29b0056bb58061218b94e0d944f30c /ipc/ipc_channel.h
parenta4b4bd8ac913f09948ba22113e114339bdfd6a97 (diff)
downloadchromium_src-bccbaf25ab40103942e680a95cd7ccc4ffa1adb1.zip
chromium_src-bccbaf25ab40103942e680a95cd7ccc4ffa1adb1.tar.gz
chromium_src-bccbaf25ab40103942e680a95cd7ccc4ffa1adb1.tar.bz2
Fix build warnings in NaCl IPC proxy.
BUG=116317 TEST=builds Review URL: https://chromiumcodereview.appspot.com/10982031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159344 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_channel.h')
-rw-r--r--ipc/ipc_channel.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/ipc/ipc_channel.h b/ipc/ipc_channel.h
index 36e7326..500dcf7 100644
--- a/ipc/ipc_channel.h
+++ b/ipc/ipc_channel.h
@@ -179,6 +179,7 @@ class IPC_EXPORT Channel : public Sender {
// ID. Even if true, the server may have already accepted a connection.
static bool IsNamedServerInitialized(const std::string& channel_id);
+#if !defined(OS_NACL)
// Generates a channel ID that's non-predictable and unique.
static std::string GenerateUniqueRandomChannelID();
@@ -187,6 +188,7 @@ class IPC_EXPORT Channel : public Sender {
// require additional this is simply calls GenerateUniqueRandomChannelID().
// For portability the prefix should not include the \ character.
static std::string GenerateVerifiedChannelID(const std::string& prefix);
+#endif
#if defined(OS_LINUX)
// Sandboxed processes live in a PID namespace, so when sending the IPC hello