Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Unified Diff: chrome/common/render_messages.h

Issue 9226012: Checkpoint: android fixes towards compilation of unit_tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: miranda alphabetical issue Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | content/public/browser/browser_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/render_messages.h
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index dfcb00b0190cb973ae5fb55728135d2adde22e2c..39c7116d68ffcf751c42a5ce510d08da051268d1 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> {
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | content/public/browser/browser_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698