diff options
Diffstat (limited to 'content')
44 files changed, 107 insertions, 91 deletions
diff --git a/content/browser/browser_plugin/old/browser_plugin_host.h b/content/browser/browser_plugin/old/browser_plugin_host.h index 3e86502..8ad10df 100644 --- a/content/browser/browser_plugin/old/browser_plugin_host.h +++ b/content/browser/browser_plugin/old/browser_plugin_host.h @@ -8,6 +8,7 @@ #include <map> +#include "base/compiler_specific.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_delegate.h" @@ -17,6 +18,10 @@ class WebContentsImpl; +namespace IPC { +struct ChannelHandle; +} + namespace content { class RenderProcessHost; diff --git a/content/browser/browser_plugin/old/browser_plugin_host_helper.h b/content/browser/browser_plugin/old/browser_plugin_host_helper.h index 05b8259..f61be63 100644 --- a/content/browser/browser_plugin/old/browser_plugin_host_helper.h +++ b/content/browser/browser_plugin/old/browser_plugin_host_helper.h @@ -8,7 +8,9 @@ #include <string> +#include "base/compiler_specific.h" #include "content/public/browser/render_view_host_observer.h" +#include "ipc/ipc_channel_handle.h" namespace gfx { class Size; diff --git a/content/browser/debugger/devtools_frontend_host.h b/content/browser/debugger/devtools_frontend_host.h index 6590a95..0d72c93 100644 --- a/content/browser/debugger/devtools_frontend_host.h +++ b/content/browser/debugger/devtools_frontend_host.h @@ -9,6 +9,7 @@ #include <string> #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "content/public/browser/devtools_client_host.h" #include "content/public/browser/render_view_host_observer.h" diff --git a/content/browser/debugger/render_view_devtools_agent_host.h b/content/browser/debugger/render_view_devtools_agent_host.h index 912f787..28e22ca 100644 --- a/content/browser/debugger/render_view_devtools_agent_host.h +++ b/content/browser/debugger/render_view_devtools_agent_host.h @@ -9,6 +9,7 @@ #include <map> #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "content/browser/debugger/devtools_agent_host.h" #include "content/common/content_export.h" #include "content/public/browser/render_view_host_observer.h" diff --git a/content/browser/gpu/gpu_process_host.h b/content/browser/gpu/gpu_process_host.h index 8f0b05f..e3b5f5c 100644 --- a/content/browser/gpu/gpu_process_host.h +++ b/content/browser/gpu/gpu_process_host.h @@ -30,6 +30,10 @@ struct GpuHostMsg_AcceleratedSurfaceRelease_Params; class BrowserChildProcessHostImpl; +namespace IPC { +struct ChannelHandle; +} + class GpuProcessHost : public content::BrowserChildProcessHostDelegate, public IPC::Message::Sender, public base::NonThreadSafe { diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc index f1d804f..fa3acf0 100644 --- a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc +++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc @@ -4,6 +4,7 @@ #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h" +#include "base/logging.h" #include "base/utf_string_conversions.h" #include "content/browser/renderer_host/java/java_bridge_dispatcher_host.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" diff --git a/content/public/browser/browser_child_process_host.h b/content/public/browser/browser_child_process_host.h index f15e139..75c776f 100644 --- a/content/public/browser/browser_child_process_host.h +++ b/content/public/browser/browser_child_process_host.h @@ -11,7 +11,7 @@ #include "build/build_config.h" #include "content/common/content_export.h" #include "content/public/common/process_type.h" -#include "ipc/ipc_message.h" +#include "ipc/ipc_sender.h" class CommandLine; class FilePath; @@ -24,7 +24,7 @@ struct ChildProcessData; // This represents child processes of the browser process, i.e. plugins. They // will get terminated at browser shutdown. -class CONTENT_EXPORT BrowserChildProcessHost : public IPC::Message::Sender { +class CONTENT_EXPORT BrowserChildProcessHost : public IPC::Sender { public: // Used to create a child process host. The delegate must outlive this object. static BrowserChildProcessHost* Create( diff --git a/content/public/browser/browser_child_process_host_delegate.h b/content/public/browser/browser_child_process_host_delegate.h index e028c9a..82c5b60d 100644 --- a/content/public/browser/browser_child_process_host_delegate.h +++ b/content/public/browser/browser_child_process_host_delegate.h @@ -7,13 +7,12 @@ #pragma once #include "content/common/content_export.h" -#include "ipc/ipc_channel.h" +#include "ipc/ipc_listener.h" namespace content { // Interface that all users of BrowserChildProcessHost need to provide. -class CONTENT_EXPORT BrowserChildProcessHostDelegate - : public IPC::Channel::Listener { +class CONTENT_EXPORT BrowserChildProcessHostDelegate : public IPC::Listener { public: virtual ~BrowserChildProcessHostDelegate() {} diff --git a/content/public/browser/browser_message_filter.cc b/content/public/browser/browser_message_filter.cc index 6e5b598..51eab11 100644 --- a/content/public/browser/browser_message_filter.cc +++ b/content/public/browser/browser_message_filter.cc @@ -98,7 +98,7 @@ base::TaskRunner* BrowserMessageFilter::OverrideTaskRunnerForMessage( } bool BrowserMessageFilter::CheckCanDispatchOnUI(const IPC::Message& message, - IPC::Message::Sender* sender) { + IPC::Sender* sender) { #if defined(OS_WIN) && !defined(USE_AURA) // On Windows there's a potential deadlock with sync messsages going in // a circle from browser -> plugin -> renderer -> browser. diff --git a/content/public/browser/browser_message_filter.h b/content/public/browser/browser_message_filter.h index 2bebdd0..03f432f 100644 --- a/content/public/browser/browser_message_filter.h +++ b/content/public/browser/browser_message_filter.h @@ -19,9 +19,9 @@ namespace content { // Base class for message filters in the browser process. You can receive and // send messages on any thread. -class CONTENT_EXPORT BrowserMessageFilter : - public IPC::ChannelProxy::MessageFilter, - public IPC::Message::Sender { +class CONTENT_EXPORT BrowserMessageFilter + : public IPC::ChannelProxy::MessageFilter, + public IPC::Sender { public: BrowserMessageFilter(); @@ -33,9 +33,8 @@ class CONTENT_EXPORT BrowserMessageFilter : // DON'T OVERRIDE THIS! Override the other version below. virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - // IPC::Message::Sender implementation. Can be called on any thread. Can't - // send sync messages (since we don't want to block the browser on any other - // process). + // IPC::Sender implementation. Can be called on any thread. Can't send sync + // messages (since we don't want to block the browser on any other process). virtual bool Send(IPC::Message* message) OVERRIDE; // If you want the given message to be dispatched to your OnMessageReceived on @@ -69,7 +68,7 @@ class CONTENT_EXPORT BrowserMessageFilter : // Checks that the given message can be dispatched on the UI thread, depending // on the platform. If not, returns false and an error ot the sender. static bool CheckCanDispatchOnUI(const IPC::Message& message, - IPC::Message::Sender* sender); + IPC::Sender* sender); // Call this if a message couldn't be deserialized. This kills the renderer. // Can be called on any thread. diff --git a/content/public/browser/render_process_host.h b/content/public/browser/render_process_host.h index a27e66f..6b128dc 100644 --- a/content/public/browser/render_process_host.h +++ b/content/public/browser/render_process_host.h @@ -11,7 +11,7 @@ #include "base/process_util.h" #include "content/common/content_export.h" #include "ipc/ipc_channel_proxy.h" -#include "ipc/ipc_message.h" +#include "ipc/ipc_sender.h" #include "ui/gfx/native_widget_types.h" #include "ui/surface/transport_dib.h" @@ -32,8 +32,8 @@ namespace content { // Interface that represents the browser side of the browser <-> renderer // communication channel. There will generally be one RenderProcessHost per // renderer process. -class CONTENT_EXPORT RenderProcessHost : public IPC::Message::Sender, - public IPC::Channel::Listener { +class CONTENT_EXPORT RenderProcessHost : public IPC::Sender, + public IPC::Listener { public: typedef IDMap<RenderProcessHost>::iterator iterator; typedef IDMap<RenderWidgetHost>::const_iterator RenderWidgetHostsIterator; diff --git a/content/public/browser/render_view_host_observer.h b/content/public/browser/render_view_host_observer.h index a6a1734..ea12cff 100644 --- a/content/public/browser/render_view_host_observer.h +++ b/content/public/browser/render_view_host_observer.h @@ -6,7 +6,9 @@ #define CONTENT_PUBLIC_BROWSER_RENDER_VIEW_HOST_OBSERVER_H_ #pragma once -#include "ipc/ipc_channel.h" +#include "base/compiler_specific.h" +#include "ipc/ipc_listener.h" +#include "ipc/ipc_sender.h" #include "content/common/content_export.h" class GURL; @@ -18,8 +20,8 @@ class RenderViewHostImpl; // An observer API implemented by classes which want to filter IPC messages from // RenderViewHost. -class CONTENT_EXPORT RenderViewHostObserver : public IPC::Channel::Listener, - public IPC::Message::Sender { +class CONTENT_EXPORT RenderViewHostObserver : public IPC::Listener, + public IPC::Sender { public: protected: @@ -40,10 +42,10 @@ class CONTENT_EXPORT RenderViewHostObserver : public IPC::Channel::Listener, // Notifies that a navigation is starting. virtual void Navigate(const GURL& url); - // IPC::Channel::Listener implementation. + // IPC::Listener implementation. virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - // IPC::Message::Sender implementation. + // IPC::Sender implementation. virtual bool Send(IPC::Message* message) OVERRIDE; RenderViewHost* render_view_host() const; diff --git a/content/public/browser/render_widget_host.h b/content/public/browser/render_widget_host.h index 5033d4d..61a7f3a 100644 --- a/content/public/browser/render_widget_host.h +++ b/content/public/browser/render_widget_host.h @@ -260,9 +260,8 @@ class CONTENT_EXPORT RenderWidgetHost : public IPC::Sender { // Called to notify the RenderWidget that it has been resized. virtual void WasResized() = 0; - // Access to the implementation's - // IPC::Channel::Listener::OnMessageReceived. Intended only for - // test code. + // Access to the implementation's IPC::Listener::OnMessageReceived. Intended + // only for test code. // Add a keyboard listener that can handle key presses without requiring // focus. diff --git a/content/public/browser/resource_dispatcher_host_delegate.cc b/content/public/browser/resource_dispatcher_host_delegate.cc index b3d9ea7..7301b61 100644 --- a/content/public/browser/resource_dispatcher_host_delegate.cc +++ b/content/public/browser/resource_dispatcher_host_delegate.cc @@ -70,7 +70,7 @@ bool ResourceDispatcherHostDelegate::ShouldForceDownloadResource( void ResourceDispatcherHostDelegate::OnResponseStarted( net::URLRequest* request, ResourceResponse* response, - IPC::Message::Sender* sender) { + IPC::Sender* sender) { } void ResourceDispatcherHostDelegate::OnRequestRedirected( diff --git a/content/public/browser/resource_dispatcher_host_delegate.h b/content/public/browser/resource_dispatcher_host_delegate.h index d23c0da..f723356 100644 --- a/content/public/browser/resource_dispatcher_host_delegate.h +++ b/content/public/browser/resource_dispatcher_host_delegate.h @@ -105,7 +105,7 @@ class CONTENT_EXPORT ResourceDispatcherHostDelegate { virtual void OnResponseStarted( net::URLRequest* request, ResourceResponse* response, - IPC::Message::Sender* sender); + IPC::Sender* sender); // Informs the delegate that a request has been redirected. virtual void OnRequestRedirected( diff --git a/content/public/browser/utility_process_host.h b/content/public/browser/utility_process_host.h index 5b10b32..fa37006 100644 --- a/content/public/browser/utility_process_host.h +++ b/content/public/browser/utility_process_host.h @@ -9,7 +9,7 @@ #include "base/process_util.h" #include "content/common/content_export.h" #include "content/public/browser/browser_thread.h" -#include "ipc/ipc_message.h" +#include "ipc/ipc_sender.h" class FilePath; @@ -28,7 +28,7 @@ class UtilityProcessHostClient; // Note: If your class keeps a ptr to an object of this type, grab a weak ptr to // avoid a use after free since this object is deleted synchronously but the // client notification is asynchronous. See http://crbug.com/108871. -class UtilityProcessHost : public IPC::Message::Sender, +class UtilityProcessHost : public IPC::Sender, public base::SupportsWeakPtr<UtilityProcessHost> { public: // Used to create a utility process. diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h index 988968a..c64d159 100644 --- a/content/public/browser/web_contents_observer.h +++ b/content/public/browser/web_contents_observer.h @@ -9,7 +9,8 @@ #include "content/common/content_export.h" #include "content/public/browser/navigation_controller.h" #include "content/public/common/page_transition_types.h" -#include "ipc/ipc_channel.h" +#include "ipc/ipc_listener.h" +#include "ipc/ipc_sender.h" #include "webkit/glue/window_open_disposition.h" class WebContentsImpl; @@ -24,8 +25,8 @@ struct Referrer; // An observer API implemented by classes which are interested in various page // load events from WebContents. They also get a chance to filter IPC messages. -class CONTENT_EXPORT WebContentsObserver : public IPC::Channel::Listener, - public IPC::Message::Sender { +class CONTENT_EXPORT WebContentsObserver : public IPC::Listener, + public IPC::Sender { public: // Only one of the two methods below will be called when a RVH is created for // a WebContents, depending on whether it's for an interstitial or not. @@ -119,10 +120,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Channel::Listener, // It is safe to delete 'this' from here. virtual void WebContentsDestroyed(WebContents* web_contents) {} - // IPC::Channel::Listener implementation. + // IPC::Listener implementation. virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; - // IPC::Message::Sender implementation. + // IPC::Sender implementation. virtual bool Send(IPC::Message* message) OVERRIDE; int routing_id() const; diff --git a/content/public/common/child_process_host.h b/content/public/common/child_process_host.h index 499ac2e..f04bb0a 100644 --- a/content/public/common/child_process_host.h +++ b/content/public/common/child_process_host.h @@ -19,7 +19,7 @@ class ChildProcessHostDelegate; // This represents a non-browser process. This can include traditional child // processes like plugins, or an embedder could even use this for long lived // processes that run independent of the browser process. -class CONTENT_EXPORT ChildProcessHost : public IPC::Message::Sender { +class CONTENT_EXPORT ChildProcessHost : public IPC::Sender { public: virtual ~ChildProcessHost() {} diff --git a/content/public/common/child_process_host_delegate.h b/content/public/common/child_process_host_delegate.h index 6d2b72a..6ae55c4 100644 --- a/content/public/common/child_process_host_delegate.h +++ b/content/public/common/child_process_host_delegate.h @@ -9,12 +9,12 @@ #include <string> #include "content/common/content_export.h" -#include "ipc/ipc_channel.h" +#include "ipc/ipc_listener.h" namespace content { // Interface that all users of ChildProcessHost need to provide. -class ChildProcessHostDelegate : public IPC::Channel::Listener { +class ChildProcessHostDelegate : public IPC::Listener { public: virtual ~ChildProcessHostDelegate() {} diff --git a/content/public/renderer/render_thread.h b/content/public/renderer/render_thread.h index 81db195..1d12f80 100644 --- a/content/public/renderer/render_thread.h +++ b/content/public/renderer/render_thread.h @@ -9,6 +9,7 @@ #include "base/shared_memory.h" #include "content/common/content_export.h" #include "ipc/ipc_channel_proxy.h" +#include "ipc/ipc_sender.h" #if defined(OS_WIN) #include <windows.h> @@ -30,7 +31,7 @@ namespace content { class RenderProcessObserver; class ResourceDispatcherDelegate; -class CONTENT_EXPORT RenderThread : public IPC::Message::Sender { +class CONTENT_EXPORT RenderThread : public IPC::Sender { public: // Returns the one render thread for this process. Note that this can only // be accessed when running on the render thread itself. @@ -47,7 +48,7 @@ class CONTENT_EXPORT RenderThread : public IPC::Message::Sender { // Called to add or remove a listener for a particular message routing ID. // These methods normally get delegated to a MessageRouter. - virtual void AddRoute(int32 routing_id, IPC::Channel::Listener* listener) = 0; + virtual void AddRoute(int32 routing_id, IPC::Listener* listener) = 0; virtual void RemoveRoute(int32 routing_id) = 0; virtual int GenerateRoutingID() = 0; diff --git a/content/public/renderer/render_view.h b/content/public/renderer/render_view.h index b3e9744..c09a527 100644 --- a/content/public/renderer/render_view.h +++ b/content/public/renderer/render_view.h @@ -6,8 +6,9 @@ #define CONTENT_PUBLIC_RENDERER_RENDER_VIEW_H_ #include "base/basictypes.h" +#include "base/string16.h" #include "content/common/content_export.h" -#include "ipc/ipc_message.h" +#include "ipc/ipc_sender.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationPolicy.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageVisibilityState.h" #include "ui/gfx/native_widget_types.h" @@ -39,7 +40,7 @@ namespace content { class RenderViewVisitor; -class CONTENT_EXPORT RenderView : public IPC::Message::Sender { +class CONTENT_EXPORT RenderView : public IPC::Sender { public: // Returns the RenderView containing the given WebView. static RenderView* FromWebView(WebKit::WebView* webview); diff --git a/content/public/renderer/render_view_observer.h b/content/public/renderer/render_view_observer.h index 3817e0b..6acafc1 100644 --- a/content/public/renderer/render_view_observer.h +++ b/content/public/renderer/render_view_observer.h @@ -7,8 +7,10 @@ #pragma once #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "content/common/content_export.h" -#include "ipc/ipc_channel.h" +#include "ipc/ipc_listener.h" +#include "ipc/ipc_sender.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIconURL.h" class RenderViewImpl; @@ -31,8 +33,8 @@ class RenderView; // Base class for objects that want to filter incoming IPCs, and also get // notified of changes to the frame. -class CONTENT_EXPORT RenderViewObserver : public IPC::Channel::Listener, - public IPC::Message::Sender { +class CONTENT_EXPORT RenderViewObserver : public IPC::Listener, + public IPC::Sender { public: // By default, observers will be deleted when the RenderView goes away. If // they want to outlive it, they can override this function. @@ -82,14 +84,14 @@ class CONTENT_EXPORT RenderViewObserver : public IPC::Channel::Listener, virtual void Navigate(const GURL& url) {} virtual void ClosePage() {} - // IPC::Channel::Listener implementation. + // IPC::Listener implementation. virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; protected: explicit RenderViewObserver(RenderView* render_view); virtual ~RenderViewObserver(); - // IPC::Message::Sender implementation. + // IPC::Sender implementation. virtual bool Send(IPC::Message* message) OVERRIDE; RenderView* render_view(); diff --git a/content/public/test/mock_render_thread.h b/content/public/test/mock_render_thread.h index 78ca811..8520e48 100644 --- a/content/public/test/mock_render_thread.h +++ b/content/public/test/mock_render_thread.h @@ -45,8 +45,7 @@ class MockRenderThread : public RenderThread { virtual IPC::SyncMessageFilter* GetSyncMessageFilter() OVERRIDE; virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() OVERRIDE; - virtual void AddRoute(int32 routing_id, - IPC::Channel::Listener* listener) OVERRIDE; + virtual void AddRoute(int32 routing_id, IPC::Listener* listener) OVERRIDE; virtual void RemoveRoute(int32 routing_id) OVERRIDE; virtual int GenerateRoutingID() OVERRIDE; virtual void AddFilter(IPC::ChannelProxy::MessageFilter* filter) OVERRIDE; @@ -143,7 +142,7 @@ class MockRenderThread : public RenderThread { // We only keep track of one Widget, we learn its pointer when it // adds a new route. We do not keep track of Widgets created with // OnMsgCreateWindow. - IPC::Channel::Listener* widget_; + IPC::Listener* widget_; // Routing id that will be assigned to a CreateWindow Widget. int32 new_window_routing_id_; diff --git a/content/public/test/render_view_fake_resources_test.h b/content/public/test/render_view_fake_resources_test.h index 6ea092f..03afab5 100644 --- a/content/public/test/render_view_fake_resources_test.h +++ b/content/public/test/render_view_fake_resources_test.h @@ -49,7 +49,7 @@ #include "base/message_loop.h" #include "content/public/renderer/content_renderer_client.h" #include "content/public/renderer/render_view_visitor.h" -#include "ipc/ipc_channel.h" +#include "ipc/ipc_listener.h" #include "testing/gtest/include/gtest/gtest.h" class MockRenderProcess; @@ -64,10 +64,10 @@ class WebHistoryItem; namespace content { class RenderViewFakeResourcesTest : public ::testing::Test, - public IPC::Channel::Listener, + public IPC::Listener, public RenderViewVisitor { public: - // IPC::Channel::Listener implementation. + // IPC::Listener implementation. virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // RenderViewVisitor implementation. diff --git a/content/public/utility/utility_thread.h b/content/public/utility/utility_thread.h index 4eb352a..bd2bda3 100644 --- a/content/public/utility/utility_thread.h +++ b/content/public/utility/utility_thread.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "content/common/content_export.h" -#include "ipc/ipc_message.h" +#include "ipc/ipc_sender.h" #if defined(OS_WIN) #include <windows.h> @@ -16,7 +16,7 @@ namespace content { -class CONTENT_EXPORT UtilityThread : public IPC::Message::Sender { +class CONTENT_EXPORT UtilityThread : public IPC::Sender { public: // Returns the one utility thread for this process. Note that this can only // be accessed when running on the utility thread itself. diff --git a/content/renderer/dom_automation_controller.h b/content/renderer/dom_automation_controller.h index 2049408..bccd18b 100644 --- a/content/renderer/dom_automation_controller.h +++ b/content/renderer/dom_automation_controller.h @@ -6,7 +6,7 @@ #define CONTENT_RENDERER_DOM_AUTOMATION_CONTROLLER_H_ #pragma once -#include "ipc/ipc_message.h" +#include "ipc/ipc_sender.h" #include "webkit/glue/cpp_bound_class.h" /* DomAutomationController class: @@ -110,12 +110,12 @@ class DomAutomationController : public webkit_glue::CppBoundClass { void set_routing_id(int routing_id) { routing_id_ = routing_id; } - void set_message_sender(IPC::Message::Sender* sender) { + void set_message_sender(IPC::Sender* sender) { sender_ = sender; } private: - IPC::Message::Sender* sender_; + IPC::Sender* sender_; // Refer to the comments at the top of the file for more details. int routing_id_; // routing id to be used by first channel. diff --git a/content/renderer/gpu/compositor_thread.cc b/content/renderer/gpu/compositor_thread.cc index 8cbe079..b52e485 100644 --- a/content/renderer/gpu/compositor_thread.cc +++ b/content/renderer/gpu/compositor_thread.cc @@ -81,7 +81,7 @@ class CompositorThread::InputHandlerWrapper //------------------------------------------------------------------------------ -CompositorThread::CompositorThread(IPC::Channel::Listener* main_listener) +CompositorThread::CompositorThread(IPC::Listener* main_listener) : thread_("Compositor") { filter_ = new InputEventFilter(main_listener, diff --git a/content/renderer/gpu/compositor_thread.h b/content/renderer/gpu/compositor_thread.h index aed3afd..ed38a37 100644 --- a/content/renderer/gpu/compositor_thread.h +++ b/content/renderer/gpu/compositor_thread.h @@ -26,7 +26,7 @@ class CompositorThread { public: // |main_listener| refers to the central IPC message listener that lives on // the main thread, where all incoming IPC messages are first handled. - explicit CompositorThread(IPC::Channel::Listener* main_listener); + explicit CompositorThread(IPC::Listener* main_listener); ~CompositorThread(); // This MessageFilter should be added to allow input events to be redirected diff --git a/content/renderer/gpu/input_event_filter.cc b/content/renderer/gpu/input_event_filter.cc index 7831a3d..53bc9a2 100644 --- a/content/renderer/gpu/input_event_filter.cc +++ b/content/renderer/gpu/input_event_filter.cc @@ -10,7 +10,7 @@ using WebKit::WebInputEvent; -InputEventFilter::InputEventFilter(IPC::Channel::Listener* main_listener, +InputEventFilter::InputEventFilter(IPC::Listener* main_listener, base::MessageLoopProxy* target_loop, const Handler& handler) : main_loop_(base::MessageLoopProxy::current()), diff --git a/content/renderer/gpu/input_event_filter.h b/content/renderer/gpu/input_event_filter.h index 63dad1d..887c3b1 100644 --- a/content/renderer/gpu/input_event_filter.h +++ b/content/renderer/gpu/input_event_filter.h @@ -40,7 +40,7 @@ class CONTENT_EXPORT InputEventFilter // is true, then a ViewHostMsg_HandleInputEvent_ACK will not be generated, // leaving that responsibility up to the eventual handler on the main thread. // - InputEventFilter(IPC::Channel::Listener* main_listener, + InputEventFilter(IPC::Listener* main_listener, base::MessageLoopProxy* target_loop, const Handler& handler); @@ -72,11 +72,11 @@ class CONTENT_EXPORT InputEventFilter bool processed); scoped_refptr<base::MessageLoopProxy> main_loop_; - IPC::Channel::Listener* main_listener_; + IPC::Listener* main_listener_; // The sender_ only gets invoked on the thread corresponding to io_loop_. scoped_refptr<base::MessageLoopProxy> io_loop_; - IPC::Message::Sender* sender_; + IPC::Sender* sender_; // The handler_ only gets Run on the thread corresponding to target_loop_. scoped_refptr<base::MessageLoopProxy> target_loop_; diff --git a/content/renderer/gpu/input_event_filter_unittest.cc b/content/renderer/gpu/input_event_filter_unittest.cc index b264417..57f6ece 100644 --- a/content/renderer/gpu/input_event_filter_unittest.cc +++ b/content/renderer/gpu/input_event_filter_unittest.cc @@ -70,7 +70,7 @@ class InputEventRecorder { std::vector<Record> records_; }; -class IPCMessageRecorder : public IPC::Channel::Listener { +class IPCMessageRecorder : public IPC::Listener { public: virtual bool OnMessageReceived(const IPC::Message& message) { messages_.push_back(message); diff --git a/content/renderer/media/media_stream_dispatcher.h b/content/renderer/media/media_stream_dispatcher.h index 6c98158..a000c52 100644 --- a/content/renderer/media/media_stream_dispatcher.h +++ b/content/renderer/media/media_stream_dispatcher.h @@ -10,6 +10,7 @@ #include <string> #include "base/basictypes.h" +#include "base/gtest_prod_util.h" #include "base/message_loop.h" #include "content/common/content_export.h" #include "content/common/media/media_stream_options.h" diff --git a/content/renderer/p2p/socket_dispatcher.cc b/content/renderer/p2p/socket_dispatcher.cc index 1b46dcb..f3f29b8 100644 --- a/content/renderer/p2p/socket_dispatcher.cc +++ b/content/renderer/p2p/socket_dispatcher.cc @@ -18,7 +18,7 @@ namespace content { class P2PSocketDispatcher::AsyncMessageSender : public base::RefCountedThreadSafe<AsyncMessageSender> { public: - explicit AsyncMessageSender(IPC::Message::Sender* message_sender) + explicit AsyncMessageSender(IPC::Sender* message_sender) : message_loop_(base::MessageLoopProxy::current()), message_sender_(message_sender) { } @@ -44,7 +44,7 @@ class P2PSocketDispatcher::AsyncMessageSender } scoped_refptr<base::MessageLoopProxy> message_loop_; - IPC::Message::Sender* message_sender_; + IPC::Sender* message_sender_; DISALLOW_COPY_AND_ASSIGN(AsyncMessageSender); }; diff --git a/content/renderer/plugin_channel_host.cc b/content/renderer/plugin_channel_host.cc index 009c651..d2fd0ae 100644 --- a/content/renderer/plugin_channel_host.cc +++ b/content/renderer/plugin_channel_host.cc @@ -151,7 +151,7 @@ int PluginChannelHost::GenerateRouteID() { } void PluginChannelHost::AddRoute(int route_id, - IPC::Channel::Listener* listener, + IPC::Listener* listener, NPObjectBase* npobject) { NPChannelBase::AddRoute(route_id, listener, npobject); diff --git a/content/renderer/plugin_channel_host.h b/content/renderer/plugin_channel_host.h index 92001b9..e92b9c6 100644 --- a/content/renderer/plugin_channel_host.h +++ b/content/renderer/plugin_channel_host.h @@ -32,14 +32,14 @@ class PluginChannelHost : public NPChannelBase { virtual int GenerateRouteID() OVERRIDE; - void AddRoute(int route_id, IPC::Channel::Listener* listener, + void AddRoute(int route_id, IPC::Listener* listener, NPObjectBase* npobject); void RemoveRoute(int route_id); // NPChannelBase override: virtual bool Send(IPC::Message* msg) OVERRIDE; - // IPC::Channel::Listener override + // IPC::Listener override virtual void OnChannelError() OVERRIDE; static void SetListening(bool flag); @@ -65,7 +65,7 @@ class PluginChannelHost : public NPChannelBase { // Keep track of all the registered WebPluginDelegeProxies to // inform about OnChannelError - typedef base::hash_map<int, IPC::Channel::Listener*> ProxyMap; + typedef base::hash_map<int, IPC::Listener*> ProxyMap; ProxyMap proxies_; // An IPC MessageFilter that can be told to filter out all messages. This is diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 2e3c8f53..915514d 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -411,8 +411,7 @@ scoped_refptr<base::MessageLoopProxy> return ChildProcess::current()->io_message_loop_proxy(); } -void RenderThreadImpl::AddRoute(int32 routing_id, - IPC::Channel::Listener* listener) { +void RenderThreadImpl::AddRoute(int32 routing_id, IPC::Listener* listener) { widget_count_++; return ChildThread::AddRoute(routing_id, listener); } diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h index 8a23dde..10aa011 100644 --- a/content/renderer/render_thread_impl.h +++ b/content/renderer/render_thread_impl.h @@ -100,8 +100,7 @@ class CONTENT_EXPORT RenderThreadImpl : public content::RenderThread, virtual IPC::SyncMessageFilter* GetSyncMessageFilter() OVERRIDE; virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() OVERRIDE; - virtual void AddRoute(int32 routing_id, - IPC::Channel::Listener* listener) OVERRIDE; + virtual void AddRoute(int32 routing_id, IPC::Listener* listener) OVERRIDE; virtual void RemoveRoute(int32 routing_id) OVERRIDE; virtual int GenerateRoutingID() OVERRIDE; virtual void AddFilter(IPC::ChannelProxy::MessageFilter* filter) OVERRIDE; diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h index f8daf58..5c37a2c 100644 --- a/content/renderer/render_view_impl.h +++ b/content/renderer/render_view_impl.h @@ -391,7 +391,7 @@ class RenderViewImpl : public RenderWidget, // supported PPAPI plug-ins. bool HasIMETextFocus(); - // IPC::Channel::Listener implementation ------------------------------------- + // IPC::Listener implementation ---------------------------------------------- virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h index 1e418e0..e7f1111 100644 --- a/content/renderer/render_widget.h +++ b/content/renderer/render_widget.h @@ -74,8 +74,8 @@ class PluginInstance; // RenderWidget provides a communication bridge between a WebWidget and // a RenderWidgetHost, the latter of which lives in a different process. class CONTENT_EXPORT RenderWidget - : public IPC::Channel::Listener, - public IPC::Message::Sender, + : public IPC::Listener, + public IPC::Sender, NON_EXPORTED_BASE(virtual public WebKit::WebWidgetClient), public base::RefCounted<RenderWidget> { public: @@ -111,10 +111,10 @@ class CONTENT_EXPORT RenderWidget bool is_fullscreen() const { return is_fullscreen_; } bool is_hidden() const { return is_hidden_; } - // IPC::Channel::Listener + // IPC::Listener virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; - // IPC::Message::Sender + // IPC::Sender virtual bool Send(IPC::Message* msg) OVERRIDE; // WebKit::WebWidgetClient diff --git a/content/renderer/render_widget_fullscreen_pepper.h b/content/renderer/render_widget_fullscreen_pepper.h index 8d527c7a..b6b481e 100644 --- a/content/renderer/render_widget_fullscreen_pepper.h +++ b/content/renderer/render_widget_fullscreen_pepper.h @@ -54,7 +54,7 @@ class RenderWidgetFullscreenPepper : CreateContext3D() OVERRIDE; virtual MouseLockDispatcher* GetMouseLockDispatcher() OVERRIDE; - // IPC::Channel::Listener implementation. This overrides the implementation + // IPC::Listener implementation. This overrides the implementation // in RenderWidgetFullscreen. virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; diff --git a/content/renderer/web_ui_bindings.cc b/content/renderer/web_ui_bindings.cc index ffb0023..26cb6e6 100644 --- a/content/renderer/web_ui_bindings.cc +++ b/content/renderer/web_ui_bindings.cc @@ -55,7 +55,7 @@ DOMBoundBrowserObject::~DOMBoundBrowserObject() { STLDeleteContainerPointers(properties_.begin(), properties_.end()); } -WebUIBindings::WebUIBindings(IPC::Message::Sender* sender, int routing_id) +WebUIBindings::WebUIBindings(IPC::Sender* sender, int routing_id) : sender_(sender), routing_id_(routing_id) { BindCallback("send", base::Bind(&WebUIBindings::Send, base::Unretained(this))); diff --git a/content/renderer/web_ui_bindings.h b/content/renderer/web_ui_bindings.h index 732eeed..b072cee7 100644 --- a/content/renderer/web_ui_bindings.h +++ b/content/renderer/web_ui_bindings.h @@ -7,7 +7,7 @@ #pragma once #include "content/common/content_export.h" -#include "ipc/ipc_message.h" +#include "ipc/ipc_sender.h" #include "webkit/glue/cpp_bound_class.h" // A DOMBoundBrowserObject is a backing for some object bound to the window @@ -39,8 +39,7 @@ class DOMBoundBrowserObject : public webkit_glue::CppBoundClass { // delegate. class WebUIBindings : public DOMBoundBrowserObject { public: - WebUIBindings(IPC::Message::Sender* sender, - int routing_id); + WebUIBindings(IPC::Sender* sender, int routing_id); virtual ~WebUIBindings(); private: @@ -48,7 +47,7 @@ class WebUIBindings : public DOMBoundBrowserObject { void Send(const webkit_glue::CppArgumentList& args, webkit_glue::CppVariant* result); - IPC::Message::Sender* sender_; + IPC::Sender* sender_; int routing_id_; DISALLOW_COPY_AND_ASSIGN(WebUIBindings); diff --git a/content/renderer/webplugin_delegate_proxy.h b/content/renderer/webplugin_delegate_proxy.h index 5e36520..8752cf7 100644 --- a/content/renderer/webplugin_delegate_proxy.h +++ b/content/renderer/webplugin_delegate_proxy.h @@ -52,8 +52,8 @@ class WebPlugin; // the plugin process. class WebPluginDelegateProxy : public webkit::npapi::WebPluginDelegate, - public IPC::Channel::Listener, - public IPC::Message::Sender, + public IPC::Listener, + public IPC::Sender, public base::SupportsWeakPtr<WebPluginDelegateProxy> { public: WebPluginDelegateProxy(const std::string& mime_type, @@ -105,11 +105,11 @@ class WebPluginDelegateProxy virtual void ImeCompositionCompleted(const string16& text, int plugin_id); #endif - // IPC::Channel::Listener implementation: + // IPC::Listener implementation: virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; virtual void OnChannelError() OVERRIDE; - // IPC::Message::Sender implementation: + // IPC::Sender implementation: virtual bool Send(IPC::Message* msg) OVERRIDE; virtual void SendJavaScriptStream(const GURL& url, diff --git a/content/renderer/websharedworker_proxy.h b/content/renderer/websharedworker_proxy.h index 36cac6a..2e98784 100644 --- a/content/renderer/websharedworker_proxy.h +++ b/content/renderer/websharedworker_proxy.h @@ -10,8 +10,9 @@ #include <vector> #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "googleurl/src/gurl.h" -#include "ipc/ipc_channel.h" +#include "ipc/ipc_listener.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorker.h" class ChildThread; @@ -22,7 +23,7 @@ class ChildThread; // happen via the WebMessagePortChannel, and the WebSharedWorker instance will // be freed. class WebSharedWorkerProxy : public WebKit::WebSharedWorker, - private IPC::Channel::Listener { + private IPC::Listener { public: // If the worker not loaded yet, route_id == MSG_ROUTING_NONE WebSharedWorkerProxy(ChildThread* child_thread, @@ -50,7 +51,7 @@ class WebSharedWorkerProxy : public WebKit::WebSharedWorker, virtual void clientDestroyed(); private: - // IPC::Channel::Listener implementation. + // IPC::Listener implementation. virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // Returns true if the worker is running (can send messages to it). |