summaryrefslogtreecommitdiffstats
path: root/ipc/ipc_message_utils.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-06 20:52:50 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-06 20:52:50 +0000
commit6bd91debb17f5790401f3a28da1d71bc0d1a83ce (patch)
treefd86ea2aff3a25c886c4dcb66ba70b01a6131ef6 /ipc/ipc_message_utils.h
parent718a86efff263d7fab036cc2ec90d463b4fb3fd6 (diff)
downloadchromium_src-6bd91debb17f5790401f3a28da1d71bc0d1a83ce.zip
chromium_src-6bd91debb17f5790401f3a28da1d71bc0d1a83ce.tar.gz
chromium_src-6bd91debb17f5790401f3a28da1d71bc0d1a83ce.tar.bz2
Get the rest of the chrome target to build (but not link) with USE_AURA.
http://crbug.com/93947 TEST=none Review URL: http://codereview.chromium.org/7839002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_message_utils.h')
-rw-r--r--ipc/ipc_message_utils.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h
index 7c46f90..b64b65a 100644
--- a/ipc/ipc_message_utils.h
+++ b/ipc/ipc_message_utils.h
@@ -20,6 +20,10 @@
#include "ipc/ipc_param_traits.h"
#include "ipc/ipc_sync_message.h"
+#if defined(USE_AURA)
+#include "ui/gfx/native_widget_types.h"
+#endif
+
#if defined(COMPILER_GCC)
// GCC "helpfully" tries to inline template methods in release mode. Except we
// want the majority of the template junk being expanded once in the
@@ -659,9 +663,13 @@ struct ParamTraits<HANDLE> {
}
};
+#if defined(USE_AURA)
+// TODO(beng): Figure out why this is needed, fix that issue and remove
+// this. Brett and I were unable to figure out why, but he
+// thought this should be harmless.
template <>
-struct ParamTraits<HCURSOR> {
- typedef HCURSOR param_type;
+struct ParamTraits<gfx::PluginWindowHandle> {
+ typedef gfx::PluginWindowHandle param_type;
static void Write(Message* m, const param_type& p) {
m->WriteUInt32(reinterpret_cast<uint32>(p));
}
@@ -673,6 +681,7 @@ struct ParamTraits<HCURSOR> {
l->append(StringPrintf("0x%X", p));
}
};
+#endif
template <>
struct ParamTraits<HACCEL> {