summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-21 21:44:38 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-21 21:44:38 +0000
commit5ed25b3e6f4a9da2b0dfe7b0787f4715cf27ef2e (patch)
tree064a308e78cc64ed4967814cf3cf218dd9f75733 /content
parent4c9b0d4cf2b3810f57fff67aa1ebfa53d7961296 (diff)
downloadchromium_src-5ed25b3e6f4a9da2b0dfe7b0787f4715cf27ef2e.zip
chromium_src-5ed25b3e6f4a9da2b0dfe7b0787f4715cf27ef2e.tar.gz
chromium_src-5ed25b3e6f4a9da2b0dfe7b0787f4715cf27ef2e.tar.bz2
Make pepper_messages.h be included by content's message_generator instead of all_messages.h in chrome.
BUG=98716 Review URL: http://codereview.chromium.org/8365023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106783 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/common/content_message_generator.h1
-rw-r--r--content/common/pepper_messages.cc6
-rw-r--r--content/content_common.gypi1
3 files changed, 1 insertions, 7 deletions
diff --git a/content/common/content_message_generator.h b/content/common/content_message_generator.h
index 2f8fdfc..37a6f7d 100644
--- a/content/common/content_message_generator.h
+++ b/content/common/content_message_generator.h
@@ -27,6 +27,7 @@
#include "content/common/mime_registry_messages.h"
#include "content/common/p2p_messages.h"
#include "content/common/pepper_file_messages.h"
+#include "content/common/pepper_messages.h"
#include "content/common/plugin_messages.h"
#include "content/common/quota_messages.h"
#include "content/common/resource_messages.h"
diff --git a/content/common/pepper_messages.cc b/content/common/pepper_messages.cc
deleted file mode 100644
index 4d7602b..0000000
--- a/content/common/pepper_messages.cc
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#define IPC_MESSAGE_IMPL
-#include "content/common/pepper_messages.h"
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 0eb7748..bf62e96 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -178,7 +178,6 @@
'common/page_zoom.h',
'common/pepper_file_messages.cc',
'common/pepper_file_messages.h',
- 'common/pepper_messages.cc',
'common/pepper_messages.h',
'common/pepper_plugin_registry.cc',
'common/pepper_plugin_registry.h',