diff options
| -rw-r--r-- | chrome/browser/gpu_process_host_ui_shim.h | 3 | ||||
| -rw-r--r-- | chrome/chrome_common.gypi | 5 | ||||
| -rw-r--r-- | chrome/common/child_thread.h | 3 | ||||
| -rw-r--r-- | chrome/gpu/gpu_channel.h | 4 | ||||
| -rw-r--r-- | chrome/plugin/plugin_channel_base.h | 2 | ||||
| -rw-r--r-- | chrome/renderer/gpu_channel_host.h | 4 | ||||
| -rw-r--r-- | chrome/renderer/gpu_video_decoder_host.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/gpu_video_decoder_host_unittest.cc | 2 | ||||
| -rw-r--r-- | content/common/message_router.cc (renamed from chrome/common/message_router.cc) | 4 | ||||
| -rw-r--r-- | content/common/message_router.h (renamed from chrome/common/message_router.h) | 8 | ||||
| -rw-r--r-- | content/content.gyp | 1 | ||||
| -rw-r--r-- | content/content_common.gypi | 2 |
12 files changed, 19 insertions, 21 deletions
diff --git a/chrome/browser/gpu_process_host_ui_shim.h b/chrome/browser/gpu_process_host_ui_shim.h index 848fb11..ddd9dec 100644 --- a/chrome/browser/gpu_process_host_ui_shim.h +++ b/chrome/browser/gpu_process_host_ui_shim.h @@ -22,8 +22,7 @@ #include "base/threading/non_thread_safe.h" #include "chrome/common/gpu_feature_flags.h" #include "chrome/common/gpu_info.h" -#include "chrome/common/message_router.h" -#include "ipc/ipc_channel.h" +#include "content/common/message_router.h" #include "ui/gfx/native_widget_types.h" namespace gfx { diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 646c0c9..3fad755 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -109,8 +109,6 @@ 'common/logging_chrome.cc', 'common/logging_chrome.h', 'common/main_function_params.h', - 'common/message_router.cc', - 'common/message_router.h', 'common/metrics_helpers.cc', 'common/metrics_helpers.h', 'common/mime_registry_messages.h', @@ -629,6 +627,9 @@ 'common/resource_dispatcher_dummy.cc', 'common/socket_stream_dispatcher_dummy.cc', 'common/url_constants.cc', + # TODO(jam): remove me once child_thread (which uses this) is moved + # out of chrome_common. + '../content/common/message_router.cc', ], 'export_dependent_settings': [ '../app/app.gyp:app_base_nacl_win64', diff --git a/chrome/common/child_thread.h b/chrome/common/child_thread.h index 4537f1b..9ef202e 100644 --- a/chrome/common/child_thread.h +++ b/chrome/common/child_thread.h @@ -8,8 +8,7 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" -#include "chrome/common/message_router.h" -#include "ipc/ipc_message.h" +#include "content/common/message_router.h" #include "webkit/glue/resource_loader_bridge.h" class FileSystemDispatcher; diff --git a/chrome/gpu/gpu_channel.h b/chrome/gpu/gpu_channel.h index a3cb341..a0f4655 100644 --- a/chrome/gpu/gpu_channel.h +++ b/chrome/gpu/gpu_channel.h @@ -16,10 +16,8 @@ #include "build/build_config.h" #include "chrome/common/gpu_create_command_buffer_config.h" #include "chrome/common/gpu_video_common.h" -#include "chrome/common/message_router.h" #include "chrome/gpu/gpu_command_buffer_stub.h" -#include "ipc/ipc_channel.h" -#include "ipc/ipc_message.h" +#include "content/common/message_router.h" #include "ipc/ipc_sync_channel.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" diff --git a/chrome/plugin/plugin_channel_base.h b/chrome/plugin/plugin_channel_base.h index c8d5e84..9368508 100644 --- a/chrome/plugin/plugin_channel_base.h +++ b/chrome/plugin/plugin_channel_base.h @@ -13,8 +13,8 @@ #include "base/message_loop.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "chrome/common/message_router.h" #include "chrome/plugin/npobject_base.h" +#include "content/common/message_router.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_sync_channel.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/renderer/gpu_channel_host.h b/chrome/renderer/gpu_channel_host.h index d086367..88979a9 100644 --- a/chrome/renderer/gpu_channel_host.h +++ b/chrome/renderer/gpu_channel_host.h @@ -13,10 +13,8 @@ #include "base/process_util.h" #include "base/scoped_ptr.h" #include "chrome/common/gpu_info.h" -#include "chrome/common/message_router.h" -#include "ipc/ipc_channel.h" +#include "content/common/message_router.h" #include "ipc/ipc_channel_handle.h" -#include "ipc/ipc_message.h" #include "ipc/ipc_sync_channel.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" diff --git a/chrome/renderer/gpu_video_decoder_host.cc b/chrome/renderer/gpu_video_decoder_host.cc index 2e2b227..23756ad 100644 --- a/chrome/renderer/gpu_video_decoder_host.cc +++ b/chrome/renderer/gpu_video_decoder_host.cc @@ -5,8 +5,8 @@ #include "chrome/renderer/gpu_video_decoder_host.h" #include "chrome/common/gpu_messages.h" -#include "chrome/common/message_router.h" #include "media/base/pipeline.h" +#include "content/common/message_router.h" #include "media/video/video_decode_context.h" GpuVideoDecoderHost::GpuVideoDecoderHost(MessageRouter* router, diff --git a/chrome/renderer/gpu_video_decoder_host_unittest.cc b/chrome/renderer/gpu_video_decoder_host_unittest.cc index 6f399d6..b5e8ca6 100644 --- a/chrome/renderer/gpu_video_decoder_host_unittest.cc +++ b/chrome/renderer/gpu_video_decoder_host_unittest.cc @@ -4,8 +4,8 @@ #include "base/message_loop.h" #include "chrome/common/gpu_messages.h" -#include "chrome/common/message_router.h" #include "chrome/renderer/gpu_video_decoder_host.h" +#include "content/common/message_router.h" #include "media/base/pipeline.h" #include "media/video/video_mock_objects.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/common/message_router.cc b/content/common/message_router.cc index b3ea5960..b019843 100644 --- a/chrome/common/message_router.cc +++ b/content/common/message_router.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// 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. -#include "chrome/common/message_router.h" +#include "content/common/message_router.h" MessageRouter::MessageRouter() { } diff --git a/chrome/common/message_router.h b/content/common/message_router.h index e6709be..cb97f3f 100644 --- a/chrome/common/message_router.h +++ b/content/common/message_router.h @@ -1,9 +1,9 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// 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. -#ifndef CHROME_COMMON_MESSAGE_ROUTER_H__ -#define CHROME_COMMON_MESSAGE_ROUTER_H__ +#ifndef CONTENT_COMMON_MESSAGE_ROUTER_H_ +#define CONTENT_COMMON_MESSAGE_ROUTER_H_ #pragma once #include "base/id_map.h" @@ -60,4 +60,4 @@ class MessageRouter : public IPC::Channel::Listener, DISALLOW_COPY_AND_ASSIGN(MessageRouter); }; -#endif // CHROME_COMMON_MESSAGE_ROUTER_H__ +#endif // CONTENT_COMMON_MESSAGE_ROUTER_H_ diff --git a/content/content.gyp b/content/content.gyp index db71289..328270b 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -9,5 +9,6 @@ 'includes': [ 'content_browser.gypi', 'content_common.gypi', + #'content_gpu.gypi', ], } diff --git a/content/content_common.gypi b/content/content_common.gypi index f7d6795..477d460 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -16,6 +16,8 @@ 'sources': [ "common/content_switches.cc", "common/content_switches.h", + 'common/message_router.cc', + 'common/message_router.h', "common/p2p_messages.cc", "common/p2p_messages.h", "common/p2p_sockets.cc", |