diff options
Diffstat (limited to 'content/renderer')
25 files changed, 42 insertions, 40 deletions
diff --git a/content/renderer/java/java_bridge_channel.cc b/content/renderer/java/java_bridge_channel.cc index fa4533e..7d95421 100644 --- a/content/renderer/java/java_bridge_channel.cc +++ b/content/renderer/java/java_bridge_channel.cc @@ -4,8 +4,8 @@ #include "content/renderer/java/java_bridge_channel.h" +#include "content/child/child_process.h" #include "content/child/plugin_messages.h" -#include "content/common/child_process.h" #include "content/common/java_bridge_messages.h" namespace content { diff --git a/content/renderer/java/java_bridge_dispatcher.cc b/content/renderer/java/java_bridge_dispatcher.cc index ffab104..bab01d2 100644 --- a/content/renderer/java/java_bridge_dispatcher.cc +++ b/content/renderer/java/java_bridge_dispatcher.cc @@ -4,8 +4,8 @@ #include "content/renderer/java/java_bridge_dispatcher.h" +#include "content/child/child_process.h" #include "content/child/npobject_util.h" // For CreateNPVariant() -#include "content/common/child_process.h" #include "content/common/java_bridge_messages.h" #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" diff --git a/content/renderer/media/pepper_platform_video_decoder_impl.cc b/content/renderer/media/pepper_platform_video_decoder_impl.cc index d305ffa..9fe3798 100644 --- a/content/renderer/media/pepper_platform_video_decoder_impl.cc +++ b/content/renderer/media/pepper_platform_video_decoder_impl.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/logging.h" -#include "content/common/child_process.h" +#include "content/child/child_process.h" #include "content/common/gpu/client/gpu_channel_host.h" #include "content/renderer/render_thread_impl.h" diff --git a/content/renderer/media/renderer_gpu_video_decoder_factories.cc b/content/renderer/media/renderer_gpu_video_decoder_factories.cc index b3f8c72..2a59e67 100644 --- a/content/renderer/media/renderer_gpu_video_decoder_factories.cc +++ b/content/renderer/media/renderer_gpu_video_decoder_factories.cc @@ -8,7 +8,7 @@ #include <GLES2/gl2ext.h> #include "base/bind.h" -#include "content/common/child_thread.h" +#include "content/child/child_thread.h" #include "content/common/gpu/client/gpu_channel_host.h" #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" #include "gpu/command_buffer/client/gles2_implementation.h" diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc index 1382c8f..c6b7bf2 100644 --- a/content/renderer/media/video_capture_impl.cc +++ b/content/renderer/media/video_capture_impl.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/stl_util.h" -#include "content/common/child_process.h" +#include "content/child/child_process.h" #include "content/common/media/video_capture_messages.h" #include "media/base/limits.h" diff --git a/content/renderer/media/video_capture_impl_unittest.cc b/content/renderer/media/video_capture_impl_unittest.cc index b158b45..8befed0 100644 --- a/content/renderer/media/video_capture_impl_unittest.cc +++ b/content/renderer/media/video_capture_impl_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/message_loop.h" -#include "content/common/child_process.h" +#include "content/child/child_process.h" #include "content/common/media/video_capture_messages.h" #include "content/renderer/media/video_capture_impl.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/content/renderer/media/webrtc_audio_capturer.cc b/content/renderer/media/webrtc_audio_capturer.cc index 0f35b4f..7ab1af8 100644 --- a/content/renderer/media/webrtc_audio_capturer.cc +++ b/content/renderer/media/webrtc_audio_capturer.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/string_util.h" -#include "content/common/child_process.h" +#include "content/child/child_process.h" #include "content/renderer/media/audio_device_factory.h" #include "content/renderer/media/webrtc_audio_capturer_sink_owner.h" #include "content/renderer/media/webrtc_audio_device_impl.h" diff --git a/content/renderer/p2p/socket_dispatcher.cc b/content/renderer/p2p/socket_dispatcher.cc index 7bb7444..e0812ce 100644 --- a/content/renderer/p2p/socket_dispatcher.cc +++ b/content/renderer/p2p/socket_dispatcher.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/memory/ref_counted.h" #include "base/message_loop_proxy.h" -#include "content/common/child_process.h" +#include "content/child/child_process.h" #include "content/common/p2p_messages.h" #include "content/renderer/p2p/host_address_request.h" #include "content/renderer/p2p/socket_client.h" diff --git a/content/renderer/pepper/pepper_file_system_host.cc b/content/renderer/pepper/pepper_file_system_host.cc index 79d1be6..6098db6 100644 --- a/content/renderer/pepper/pepper_file_system_host.cc +++ b/content/renderer/pepper/pepper_file_system_host.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/callback.h" -#include "content/common/child_thread.h" -#include "content/common/fileapi/file_system_dispatcher.h" +#include "content/child/child_thread.h" +#include "content/child/fileapi/file_system_dispatcher.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/renderer_ppapi_host.h" #include "ppapi/c/pp_errors.h" diff --git a/content/renderer/pepper/pepper_platform_audio_input_impl.cc b/content/renderer/pepper/pepper_platform_audio_input_impl.cc index 87afb09..1a3398e 100644 --- a/content/renderer/pepper/pepper_platform_audio_input_impl.cc +++ b/content/renderer/pepper/pepper_platform_audio_input_impl.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/message_loop_proxy.h" #include "build/build_config.h" -#include "content/common/child_process.h" +#include "content/child/child_process.h" #include "content/renderer/media/audio_input_message_filter.h" #include "content/renderer/pepper/pepper_plugin_delegate_impl.h" #include "content/renderer/render_thread_impl.h" diff --git a/content/renderer/pepper/pepper_platform_audio_output_impl.cc b/content/renderer/pepper/pepper_platform_audio_output_impl.cc index 05600dd..60b5d92 100644 --- a/content/renderer/pepper/pepper_platform_audio_output_impl.cc +++ b/content/renderer/pepper/pepper_platform_audio_output_impl.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/message_loop_proxy.h" #include "build/build_config.h" -#include "content/common/child_process.h" +#include "content/child/child_process.h" #include "content/common/media/audio_messages.h" #include "content/renderer/media/audio_message_filter.h" #include "content/renderer/render_thread_impl.h" diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc index 5840837..bc9fbf1 100644 --- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc @@ -18,16 +18,16 @@ #include "base/strings/string_split.h" #include "base/sync_socket.h" #include "base/time.h" -#include "content/common/child_process.h" +#include "content/child/child_process.h" +#include "content/child/child_thread.h" +#include "content/child/fileapi/file_system_dispatcher.h" +#include "content/child/quota_dispatcher.h" #include "content/common/child_process_messages.h" -#include "content/common/child_thread.h" -#include "content/common/fileapi/file_system_dispatcher.h" #include "content/common/fileapi/file_system_messages.h" #include "content/common/gpu/client/context_provider_command_buffer.h" #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" #include "content/common/pepper_messages.h" #include "content/common/pepper_plugin_registry.h" -#include "content/common/quota_dispatcher.h" #include "content/common/sandbox_util.h" #include "content/common/view_messages.h" #include "content/public/common/content_switches.h" diff --git a/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc b/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc index 2225314..738a324 100644 --- a/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc +++ b/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc @@ -4,7 +4,7 @@ #include "content/renderer/pepper/pepper_proxy_channel_delegate_impl.h" -#include "content/common/child_process.h" +#include "content/child/child_process.h" #include "content/common/sandbox_util.h" namespace content { diff --git a/content/renderer/plugin_channel_host.cc b/content/renderer/plugin_channel_host.cc index ba2e81c..53cfea1 100644 --- a/content/renderer/plugin_channel_host.cc +++ b/content/renderer/plugin_channel_host.cc @@ -6,9 +6,9 @@ #include "base/metrics/histogram.h" #include "base/time.h" +#include "content/child/child_process.h" #include "content/child/npobject_base.h" #include "content/child/plugin_messages.h" -#include "content/common/child_process.h" #if defined(OS_POSIX) #include "ipc/ipc_channel_posix.h" diff --git a/content/renderer/render_process.h b/content/renderer/render_process.h index 8443131..0b1c058 100644 --- a/content/renderer/render_process.h +++ b/content/renderer/render_process.h @@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_RENDER_PROCESS_H_ #define CONTENT_RENDERER_RENDER_PROCESS_H_ -#include "content/common/child_process.h" +#include "content/child/child_process.h" #include "skia/ext/platform_canvas.h" class TransportDIB; diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc index 1edc623..2458bf4 100644 --- a/content/renderer/render_process_impl.cc +++ b/content/renderer/render_process_impl.cc @@ -18,7 +18,7 @@ #include "base/message_loop.h" #include "base/sys_info.h" #include "base/utf_string_conversions.h" -#include "content/common/child_thread.h" +#include "content/child/child_thread.h" #include "content/common/view_messages.h" #include "content/public/common/content_switches.h" #include "content/public/renderer/content_renderer_client.h" diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index b880808..4748d17 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -25,13 +25,14 @@ #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "base/values.h" +#include "content/child/child_histogram_message_filter.h" #include "content/child/indexed_db/indexed_db_dispatcher.h" #include "content/child/indexed_db/indexed_db_message_filter.h" #include "content/child/npobject_util.h" #include "content/child/plugin_messages.h" +#include "content/child/resource_dispatcher.h" #include "content/child/web_database_observer_impl.h" #include "content/common/appcache/appcache_dispatcher.h" -#include "content/common/child_histogram_message_filter.h" #include "content/common/child_process_messages.h" #include "content/common/database_messages.h" #include "content/common/db_message_filter.h" @@ -39,7 +40,6 @@ #include "content/common/gpu/client/context_provider_command_buffer.h" #include "content/common/gpu/client/gpu_channel_host.h" #include "content/common/gpu/gpu_messages.h" -#include "content/common/resource_dispatcher.h" #include "content/common/resource_messages.h" #include "content/common/view_messages.h" #include "content/public/common/content_constants.h" diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h index 127c687..cf48425 100644 --- a/content/renderer/render_thread_impl.h +++ b/content/renderer/render_thread_impl.h @@ -13,8 +13,8 @@ #include "base/string16.h" #include "base/timer.h" #include "build/build_config.h" -#include "content/common/child_process.h" -#include "content/common/child_thread.h" +#include "content/child/child_process.h" +#include "content/child/child_thread.h" #include "content/common/content_export.h" #include "content/common/gpu/client/gpu_channel_host.h" #include "content/common/gpu/gpu_process_launch_causes.h" diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 6851b4e..c619a97 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -28,24 +28,24 @@ #include "base/strings/sys_string_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" +#include "content/child/child_thread.h" +#include "content/child/fileapi/file_system_dispatcher.h" #include "content/child/fileapi/webfilesystem_callback_adapters.h" +#include "content/child/quota_dispatcher.h" +#include "content/child/webmessageportchannel_impl.h" #include "content/common/appcache/appcache_dispatcher.h" -#include "content/common/child_thread.h" #include "content/common/clipboard_messages.h" #include "content/common/database_messages.h" #include "content/common/drag_messages.h" -#include "content/common/fileapi/file_system_dispatcher.h" #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" #include "content/common/input_messages.h" #include "content/common/java_bridge_messages.h" #include "content/common/pepper_messages.h" #include "content/common/pepper_plugin_registry.h" -#include "content/common/quota_dispatcher.h" #include "content/common/request_extra_data.h" #include "content/common/socket_stream_handle_data.h" #include "content/common/ssl_status_serialization.h" #include "content/common/view_messages.h" -#include "content/common/webmessageportchannel_impl.h" #include "content/public/common/bindings_policy.h" #include "content/public/common/content_client.h" #include "content/public/common/content_constants.h" diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc index cc8e584..2dd9caf 100644 --- a/content/renderer/renderer_main.cc +++ b/content/renderer/renderer_main.cc @@ -22,6 +22,7 @@ #include "base/string_util.h" #include "base/threading/platform_thread.h" #include "base/time.h" +#include "content/child/child_process.h" #include "content/common/pepper_plugin_registry.h" #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index 855a2fd..cd622f8 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -12,18 +12,18 @@ #include "base/shared_memory.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" +#include "content/child/database_util.h" #include "content/child/fileapi/webfilesystem_impl.h" #include "content/child/indexed_db/proxy_webidbfactory_impl.h" #include "content/child/npobject_util.h" +#include "content/child/thread_safe_sender.h" #include "content/child/webblobregistry_impl.h" -#include "content/common/database_util.h" +#include "content/child/webmessageportchannel_impl.h" #include "content/common/file_utilities_messages.h" #include "content/common/gpu/client/context_provider_command_buffer.h" #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" #include "content/common/mime_registry_messages.h" -#include "content/common/thread_safe_sender.h" #include "content/common/view_messages.h" -#include "content/common/webmessageportchannel_impl.h" #include "content/public/common/content_switches.h" #include "content/public/renderer/content_renderer_client.h" #include "content/renderer/dom_storage/webstoragenamespace_impl.h" diff --git a/content/renderer/renderer_webkitplatformsupport_impl.h b/content/renderer/renderer_webkitplatformsupport_impl.h index b4a1723..a3005ad 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.h +++ b/content/renderer/renderer_webkitplatformsupport_impl.h @@ -8,11 +8,11 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" +#include "content/child/webkitplatformsupport_impl.h" #include "content/common/content_export.h" -#include "content/common/webkitplatformsupport_impl.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorkerRepository.h" #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" #include "third_party/WebKit/public/platform/WebIDBFactory.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorkerRepository.h" #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h" namespace cc { diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc index 09c298b..4bfff02 100644 --- a/content/renderer/webplugin_delegate_proxy.cc +++ b/content/renderer/webplugin_delegate_proxy.cc @@ -24,11 +24,11 @@ #include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "base/version.h" +#include "content/child/child_process.h" #include "content/child/npobject_proxy.h" #include "content/child/npobject_stub.h" #include "content/child/npobject_util.h" #include "content/child/plugin_messages.h" -#include "content/common/child_process.h" #include "content/common/view_messages.h" #include "content/public/renderer/content_renderer_client.h" #include "content/renderer/plugin_channel_host.h" diff --git a/content/renderer/websharedworker_proxy.cc b/content/renderer/websharedworker_proxy.cc index c049ac5..ffb57a6 100644 --- a/content/renderer/websharedworker_proxy.cc +++ b/content/renderer/websharedworker_proxy.cc @@ -3,9 +3,10 @@ // found in the LICENSE file. #include "content/renderer/websharedworker_proxy.h" -#include "content/common/child_thread.h" + +#include "content/child/child_thread.h" +#include "content/child/webmessageportchannel_impl.h" #include "content/common/view_messages.h" -#include "content/common/webmessageportchannel_impl.h" #include "content/common/worker_messages.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorkerClient.h" diff --git a/content/renderer/websharedworkerrepository_impl.cc b/content/renderer/websharedworkerrepository_impl.cc index eb3fc93..d914cf7 100644 --- a/content/renderer/websharedworkerrepository_impl.cc +++ b/content/renderer/websharedworkerrepository_impl.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2009 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. +// Copyright 2009 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. #include "content/renderer/websharedworkerrepository_impl.h" -#include "content/common/child_thread.h" +#include "content/child/child_thread.h" #include "content/common/view_messages.h" #include "content/renderer/websharedworker_proxy.h" |