diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-21 08:16:08 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-21 08:16:08 +0000 |
| commit | 872f3a9486e431851b0b97599781e743561ee020 (patch) | |
| tree | 67bd3af1b6e95b1463293db07be0de2887e9c96d /content/renderer/java | |
| parent | 4cdb18d46efb8afa7414b7b3057eada8b60e15a2 (diff) | |
| download | chromium_src-872f3a9486e431851b0b97599781e743561ee020.zip chromium_src-872f3a9486e431851b0b97599781e743561ee020.tar.gz chromium_src-872f3a9486e431851b0b97599781e743561ee020.tar.bz2 | |
Move child-common classes to content/common_child
We need a place to put code that is shared between child processes of different
types but not used in the browser process. For instance, the NPObject bindings
code is used in the plugin and renderer processes but depends on WebBindings
which the browser shouldn't depend on. Some web platform features require shared
code between renderer and worker processe. The WebKit image decoders are used
by worker, renderer and utility processes.
This creates a content/common_child directory for code shared by more than one
child process type. content/common_child can depend on content/common and all
content/ subdirs except for content/browser and content/common can depend on it.
The java bridge code is (more than a) bit busted since it pulls the NPObject
bindings in to the browser, but since this code is only intended for use on
android single-process configurations I've just created DEPS exceptions for
this bit of code.
BUG=241606
Review URL: https://chromiumcodereview.appspot.com/15047014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201252 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/java')
| -rw-r--r-- | content/renderer/java/java_bridge_channel.cc | 2 | ||||
| -rw-r--r-- | content/renderer/java/java_bridge_channel.h | 2 | ||||
| -rw-r--r-- | content/renderer/java/java_bridge_dispatcher.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/content/renderer/java/java_bridge_channel.cc b/content/renderer/java/java_bridge_channel.cc index 6663d55..c783c92 100644 --- a/content/renderer/java/java_bridge_channel.cc +++ b/content/renderer/java/java_bridge_channel.cc @@ -6,7 +6,7 @@ #include "content/common/child_process.h" #include "content/common/java_bridge_messages.h" -#include "content/common/plugin_messages.h" +#include "content/common_child/plugin_messages.h" namespace content { diff --git a/content/renderer/java/java_bridge_channel.h b/content/renderer/java/java_bridge_channel.h index c6bf8d3..0dd2e5a 100644 --- a/content/renderer/java/java_bridge_channel.h +++ b/content/renderer/java/java_bridge_channel.h @@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_JAVA_JAVA_BRIDGE_CHANNEL_H_ #define CONTENT_RENDERER_JAVA_JAVA_BRIDGE_CHANNEL_H_ -#include "content/common/np_channel_base.h" +#include "content/common_child/np_channel_base.h" #include "ipc/ipc_channel_handle.h" namespace content { diff --git a/content/renderer/java/java_bridge_dispatcher.cc b/content/renderer/java/java_bridge_dispatcher.cc index 04802df5..6a659c5 100644 --- a/content/renderer/java/java_bridge_dispatcher.cc +++ b/content/renderer/java/java_bridge_dispatcher.cc @@ -6,7 +6,7 @@ #include "content/common/child_process.h" #include "content/common/java_bridge_messages.h" -#include "content/common/npobject_util.h" // For CreateNPVariant() +#include "content/common_child/npobject_util.h" // For CreateNPVariant() #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" #include "content/renderer/java/java_bridge_channel.h" |