From 9c7453daefe625d26df5c96f2766ca09f7040c54 Mon Sep 17 00:00:00 2001 From: "jrg@chromium.org" Date: Sat, 21 Jan 2012 00:45:40 +0000 Subject: Checkpoint: android fixes towards compilation of unit_tests. Dependent on clipboard.h change in https://chromiumcodereview.appspot.com/9264014 BUG=None TEST= Review URL: http://codereview.chromium.org/9226012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118567 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/common/render_messages.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'chrome/common/render_messages.h') diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index dfcb00b..39c7116 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -72,11 +72,12 @@ struct ChromeViewHostMsg_GetPluginInfo_Status { namespace IPC { -#if defined(OS_POSIX) && !defined(USE_AURA) +#if defined(OS_POSIX) && !defined(USE_AURA) && !defined(OS_ANDROID) // TODO(port): this shouldn't exist. However, the plugin stuff is really using // HWNDS (NativeView), and making Windows calls based on them. I've not figured // out the deal with plugins yet. +// TODO(android): a gfx::NativeView is the same as a gfx::NativeWindow. template <> struct ParamTraits { typedef gfx::NativeView param_type; @@ -95,7 +96,7 @@ struct ParamTraits { } }; -#endif // defined(OS_POSIX) && !defined(USE_AURA) +#endif // defined(OS_POSIX) && !defined(USE_AURA) && !defined(OS_ANDROID) template <> struct ParamTraits { -- cgit v1.1