summaryrefslogtreecommitdiffstats
path: root/content/common/content_message_generator.h
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-24 01:34:35 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-24 01:34:35 +0000
commitfffaf977dfde05c9d227bfd6951c7e7c65894154 (patch)
tree8c89b3dd78b35ea27ad43de6381b74b3a24e1f67 /content/common/content_message_generator.h
parentfe641c8aa8e5471c85fccac181c8db3b9dfef2b5 (diff)
downloadchromium_src-fffaf977dfde05c9d227bfd6951c7e7c65894154.zip
chromium_src-fffaf977dfde05c9d227bfd6951c7e7c65894154.tar.gz
chromium_src-fffaf977dfde05c9d227bfd6951c7e7c65894154.tar.bz2
Move the rest of the renderer->browser messages that belong in content. Also do a bunch of cleanup:
-move safe browsing messages together -get rid of webkit_param_traits and common_param_trait since they're no longer needed -remove the multiple include of IPC files from places that don't need it TBR=tsepez Review URL: http://codereview.chromium.org/6713084 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79235 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/content_message_generator.h')
-rw-r--r--content/common/content_message_generator.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/content/common/content_message_generator.h b/content/common/content_message_generator.h
index 3aea66c..6a29d6c 100644
--- a/content/common/content_message_generator.h
+++ b/content/common/content_message_generator.h
@@ -4,9 +4,13 @@
// Multiply-included file, hence no include guard.
+#include "content/common/child_process_messages.h"
+
+// NaCl's 64 bit Windows build only links with a bare-minimum number of
+// libraries.
+#if !defined(NACL_WIN64)
#include "content/common/appcache_messages.h"
#include "content/common/audio_messages.h"
-#include "content/common/child_process_messages.h"
#include "content/common/clipboard_messages.h"
#include "content/common/database_messages.h"
#include "content/common/desktop_notification_messages.h"
@@ -28,3 +32,4 @@
#include "content/common/view_messages.h"
#include "content/common/webblob_messages.h"
#include "content/common/worker_messages.h"
+#endif