diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-21 00:45:40 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-21 00:45:40 +0000 |
| commit | 9c7453daefe625d26df5c96f2766ca09f7040c54 (patch) | |
| tree | a30e57dfca27c4785fc611c70bee8af56829d04e /chrome/common/render_messages.h | |
| parent | 6db833d1d8cd28e31a3cc816c397a32d795f849e (diff) | |
| download | chromium_src-9c7453daefe625d26df5c96f2766ca09f7040c54.zip chromium_src-9c7453daefe625d26df5c96f2766ca09f7040c54.tar.gz chromium_src-9c7453daefe625d26df5c96f2766ca09f7040c54.tar.bz2 | |
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
Diffstat (limited to 'chrome/common/render_messages.h')
| -rw-r--r-- | chrome/common/render_messages.h | 5 |
1 files changed, 3 insertions, 2 deletions
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<gfx::NativeView> { typedef gfx::NativeView param_type; @@ -95,7 +96,7 @@ struct ParamTraits<gfx::NativeView> { } }; -#endif // defined(OS_POSIX) && !defined(USE_AURA) +#endif // defined(OS_POSIX) && !defined(USE_AURA) && !defined(OS_ANDROID) template <> struct ParamTraits<ContentSettingsPattern> { |