diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 21:01:09 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 21:01:09 +0000 |
| commit | 0a670edfacc27f9d1ec85c2764bc81a955ab15f8 (patch) | |
| tree | d6577ddaa8ad90bc030776e64f6b42c4b58c2a50 /ipc/ipc_message_utils.h | |
| parent | a733898942fc96ec09b7ddacef6152051390317f (diff) | |
| download | chromium_src-0a670edfacc27f9d1ec85c2764bc81a955ab15f8.zip chromium_src-0a670edfacc27f9d1ec85c2764bc81a955ab15f8.tar.gz chromium_src-0a670edfacc27f9d1ec85c2764bc81a955ab15f8.tar.bz2 | |
Revert 99810 - 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
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/7840010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_message_utils.h')
| -rw-r--r-- | ipc/ipc_message_utils.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h index b64b65a..7c46f90 100644 --- a/ipc/ipc_message_utils.h +++ b/ipc/ipc_message_utils.h @@ -20,10 +20,6 @@ #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 @@ -663,13 +659,9 @@ 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<gfx::PluginWindowHandle> { - typedef gfx::PluginWindowHandle param_type; +struct ParamTraits<HCURSOR> { + typedef HCURSOR param_type; static void Write(Message* m, const param_type& p) { m->WriteUInt32(reinterpret_cast<uint32>(p)); } @@ -681,7 +673,6 @@ struct ParamTraits<gfx::PluginWindowHandle> { l->append(StringPrintf("0x%X", p)); } }; -#endif template <> struct ParamTraits<HACCEL> { |