diff options
| author | kaiwang@chromium.org <kaiwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-28 01:14:23 +0000 |
|---|---|---|
| committer | kaiwang@chromium.org <kaiwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-28 01:14:23 +0000 |
| commit | a32c34b9dd7bcf91f5911768e4d601e0546f0d68 (patch) | |
| tree | 48678be23971c5c86c6f676cca667f6a2e56bbee /ppapi | |
| parent | ae2b0be000892f2c86aeb5a5aedb0ff4eb2d2063 (diff) | |
| download | chromium_src-a32c34b9dd7bcf91f5911768e4d601e0546f0d68.zip chromium_src-a32c34b9dd7bcf91f5911768e4d601e0546f0d68.tar.gz chromium_src-a32c34b9dd7bcf91f5911768e4d601e0546f0d68.tar.bz2 | |
Move tracing component to src/components
BUG=167317
COLLABORATOR=joi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11624021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/native_client.gyp | 2 | ||||
| -rw-r--r-- | ppapi/ppapi_ipc_proxy_untrusted.gyp | 2 | ||||
| -rw-r--r-- | ppapi/ppapi_ipc_untrusted.gyp | 2 | ||||
| -rw-r--r-- | ppapi/proxy/DEPS | 4 | ||||
| -rw-r--r-- | ppapi/proxy/plugin_main_nacl.cc | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp index 19bc4f7..bb2451d 100644 --- a/ppapi/native_client/native_client.gyp +++ b/ppapi/native_client/native_client.gyp @@ -449,7 +449,7 @@ '../../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted', '../../gpu/gpu_untrusted.gyp:gles2_cmd_helper_untrusted', '../../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted', - '../../content/content_components_tracing_untrusted.gyp:tracing_untrusted', + '../../components/components_tracing_untrusted.gyp:tracing_untrusted', '../../ipc/ipc_untrusted.gyp:ipc_untrusted', '../../base/base_untrusted.gyp:base_untrusted', '../../media/media_untrusted.gyp:shared_memory_support_untrusted', diff --git a/ppapi/ppapi_ipc_proxy_untrusted.gyp b/ppapi/ppapi_ipc_proxy_untrusted.gyp index ea9d8d2..a5d3f88 100644 --- a/ppapi/ppapi_ipc_proxy_untrusted.gyp +++ b/ppapi/ppapi_ipc_proxy_untrusted.gyp @@ -50,7 +50,7 @@ '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted', '../ppapi/ppapi_ipc_untrusted.gyp:ppapi_ipc_untrusted', '../third_party/khronos/khronos.gyp:khronos_headers', - '../content/content_components_tracing_untrusted.gyp:tracing_untrusted', + '../components/components_tracing_untrusted.gyp:tracing_untrusted', ], }, ], diff --git a/ppapi/ppapi_ipc_untrusted.gyp b/ppapi/ppapi_ipc_untrusted.gyp index 2e1382f..f1711fe 100644 --- a/ppapi/ppapi_ipc_untrusted.gyp +++ b/ppapi/ppapi_ipc_untrusted.gyp @@ -39,7 +39,7 @@ '../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted', '../ipc/ipc_untrusted.gyp:ipc_untrusted', '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted', - '../content/content_components_tracing_untrusted.gyp:tracing_untrusted', + '../components/components_tracing_untrusted.gyp:tracing_untrusted', ], }, ], diff --git a/ppapi/proxy/DEPS b/ppapi/proxy/DEPS index ded8bf6..e56cd3d 100644 --- a/ppapi/proxy/DEPS +++ b/ppapi/proxy/DEPS @@ -1,11 +1,11 @@ include_rules = [ "+base", - "+ipc", + "+components/tracing", "+gpu", + "+ipc", "+media/audio", "+skia", "+ui/surface", - "+content/components/tracing", # We don't want the proxy to depend on the C++ layer, which is appropriate # for plugins only. However, the completion callback factory is a very useful diff --git a/ppapi/proxy/plugin_main_nacl.cc b/ppapi/proxy/plugin_main_nacl.cc index d3886f6..04d9be3 100644 --- a/ppapi/proxy/plugin_main_nacl.cc +++ b/ppapi/proxy/plugin_main_nacl.cc @@ -14,7 +14,7 @@ #include "base/message_loop.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" -#include "content/components/tracing/child_trace_message_filter.h" +#include "components/tracing/child_trace_message_filter.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_logging.h" #include "ipc/ipc_message.h" @@ -106,7 +106,7 @@ PpapiDispatcher::PpapiDispatcher(scoped_refptr<base::MessageLoopProxy> io_loop) "NaCl IPC", base::FileDescriptor(NACL_IPC_FD, false)); InitWithChannel(this, channel_handle, false); // Channel is server. channel()->AddFilter( - new content::ChildTraceMessageFilter(message_loop_)); + new components::ChildTraceMessageFilter(message_loop_)); } base::MessageLoopProxy* PpapiDispatcher::GetIPCMessageLoop() { |