diff options
45 files changed, 88 insertions, 91 deletions
diff --git a/chrome/browser/automation/automation_browser_tracker.cc b/chrome/browser/automation/automation_browser_tracker.cc index 8c4a6f4..cb0afe8 100644 --- a/chrome/browser/automation/automation_browser_tracker.cc +++ b/chrome/browser/automation/automation_browser_tracker.cc @@ -7,8 +7,7 @@ #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/notification_source.h" -AutomationBrowserTracker::AutomationBrowserTracker( - IPC::Message::Sender* automation) +AutomationBrowserTracker::AutomationBrowserTracker(IPC::Sender* automation) : AutomationResourceTracker<Browser*>(automation) { } diff --git a/chrome/browser/automation/automation_browser_tracker.h b/chrome/browser/automation/automation_browser_tracker.h index f3c8d3b..6d5374b 100644 --- a/chrome/browser/automation/automation_browser_tracker.h +++ b/chrome/browser/automation/automation_browser_tracker.h @@ -13,7 +13,7 @@ class Browser; // Tracks Browser objects. class AutomationBrowserTracker : public AutomationResourceTracker<Browser*> { public: - explicit AutomationBrowserTracker(IPC::Message::Sender* automation); + explicit AutomationBrowserTracker(IPC::Sender* automation); virtual ~AutomationBrowserTracker(); virtual void AddObserver(Browser* resource); virtual void RemoveObserver(Browser* resource); diff --git a/chrome/browser/automation/automation_resource_message_filter.h b/chrome/browser/automation/automation_resource_message_filter.h index 201211d..9ab3291 100644 --- a/chrome/browser/automation/automation_resource_message_filter.h +++ b/chrome/browser/automation/automation_resource_message_filter.h @@ -33,7 +33,7 @@ class URLRequestContext; // starting a network request will not interfere with browser UI. class AutomationResourceMessageFilter : public IPC::ChannelProxy::MessageFilter, - public IPC::Message::Sender { + public IPC::Sender { public: // Information needed to send IPCs through automation. struct AutomationDetails { @@ -64,7 +64,7 @@ class AutomationResourceMessageFilter virtual void OnFilterAdded(IPC::Channel* channel); virtual void OnFilterRemoved(); - // IPC::Channel::Listener implementation. + // IPC::Listener implementation. virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; virtual void OnChannelClosing() OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; diff --git a/chrome/browser/automation/automation_resource_tracker.cc b/chrome/browser/automation/automation_resource_tracker.cc index f1630c2..a224393 100644 --- a/chrome/browser/automation/automation_resource_tracker.cc +++ b/chrome/browser/automation/automation_resource_tracker.cc @@ -7,7 +7,7 @@ #include "chrome/common/automation_messages.h" AutomationResourceTrackerImpl::AutomationResourceTrackerImpl( - IPC::Message::Sender* sender) + IPC::Sender* sender) : sender_(sender) { } diff --git a/chrome/browser/automation/automation_resource_tracker.h b/chrome/browser/automation/automation_resource_tracker.h index b75af06..7199b1a 100644 --- a/chrome/browser/automation/automation_resource_tracker.h +++ b/chrome/browser/automation/automation_resource_tracker.h @@ -13,7 +13,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" -#include "ipc/ipc_message.h" +#include "ipc/ipc_sender.h" // Template trick so that AutomationResourceTracker can be used with non-pointer // types. @@ -31,7 +31,7 @@ struct AutomationResourceTraits<T*> { // of AutomationResourceTracker to live in a .cc file. class AutomationResourceTrackerImpl { public: - explicit AutomationResourceTrackerImpl(IPC::Message::Sender* sender); + explicit AutomationResourceTrackerImpl(IPC::Sender* sender); virtual ~AutomationResourceTrackerImpl(); protected: @@ -57,7 +57,7 @@ class AutomationResourceTrackerImpl { ResourceToHandleMap resource_to_handle_; HandleToResourceMap handle_to_resource_; - IPC::Message::Sender* sender_; + IPC::Sender* sender_; DISALLOW_COPY_AND_ASSIGN(AutomationResourceTrackerImpl); }; @@ -71,8 +71,8 @@ template <class T> class AutomationResourceTracker : public AutomationResourceTrackerImpl, public content::NotificationObserver { public: - explicit AutomationResourceTracker(IPC::Message::Sender* automation) - : AutomationResourceTrackerImpl(automation) {} + explicit AutomationResourceTracker(IPC::Sender* automation) + : AutomationResourceTrackerImpl(automation) {} // The implementations for these should call the NotificationService // to add and remove this object as an observer for the appropriate diff --git a/chrome/browser/automation/automation_tab_tracker.cc b/chrome/browser/automation/automation_tab_tracker.cc index 48e68a6..3377c8b 100644 --- a/chrome/browser/automation/automation_tab_tracker.cc +++ b/chrome/browser/automation/automation_tab_tracker.cc @@ -4,13 +4,14 @@ #include "chrome/browser/automation/automation_tab_tracker.h" +#include "base/logging.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/notification_source.h" using content::NavigationController; -AutomationTabTracker::AutomationTabTracker(IPC::Message::Sender* automation) +AutomationTabTracker::AutomationTabTracker(IPC::Sender* automation) : AutomationResourceTracker<NavigationController*>(automation) { } diff --git a/chrome/browser/automation/automation_tab_tracker.h b/chrome/browser/automation/automation_tab_tracker.h index c195771..e1bddb71 100644 --- a/chrome/browser/automation/automation_tab_tracker.h +++ b/chrome/browser/automation/automation_tab_tracker.h @@ -18,7 +18,7 @@ class NavigationController; class AutomationTabTracker : public AutomationResourceTracker<content::NavigationController*> { public: - explicit AutomationTabTracker(IPC::Message::Sender* automation); + explicit AutomationTabTracker(IPC::Sender* automation); virtual ~AutomationTabTracker(); virtual void AddObserver(content::NavigationController* resource); diff --git a/chrome/browser/automation/automation_window_tracker.cc b/chrome/browser/automation/automation_window_tracker.cc index d559d94..e7714a7 100644 --- a/chrome/browser/automation/automation_window_tracker.cc +++ b/chrome/browser/automation/automation_window_tracker.cc @@ -7,8 +7,7 @@ #include "chrome/browser/native_window_notification_source.h" #include "chrome/common/chrome_notification_types.h" -AutomationWindowTracker::AutomationWindowTracker( - IPC::Message::Sender* automation) +AutomationWindowTracker::AutomationWindowTracker(IPC::Sender* automation) : AutomationResourceTracker<gfx::NativeWindow>(automation) { } diff --git a/chrome/browser/automation/automation_window_tracker.h b/chrome/browser/automation/automation_window_tracker.h index f8dfea1..8e784a8 100644 --- a/chrome/browser/automation/automation_window_tracker.h +++ b/chrome/browser/automation/automation_window_tracker.h @@ -13,7 +13,7 @@ class AutomationWindowTracker : public AutomationResourceTracker<gfx::NativeWindow> { public: - explicit AutomationWindowTracker(IPC::Message::Sender* automation); + explicit AutomationWindowTracker(IPC::Sender* automation); virtual ~AutomationWindowTracker(); virtual void AddObserver(gfx::NativeWindow resource); diff --git a/chrome/browser/automation/chrome_frame_automation_provider.h b/chrome/browser/automation/chrome_frame_automation_provider.h index e590b5f..204b6533 100644 --- a/chrome/browser/automation/chrome_frame_automation_provider.h +++ b/chrome/browser/automation/chrome_frame_automation_provider.h @@ -24,7 +24,7 @@ class ChromeFrameAutomationProvider : public AutomationProvider { explicit ChromeFrameAutomationProvider(Profile* profile); virtual ~ChromeFrameAutomationProvider(); - // IPC::Channel::Listener overrides. + // IPC::Listener overrides. virtual bool OnMessageReceived(const IPC::Message& message); protected: diff --git a/chrome/browser/automation/testing_automation_provider.h b/chrome/browser/automation/testing_automation_provider.h index f334e25..ebe1154 100644 --- a/chrome/browser/automation/testing_automation_provider.h +++ b/chrome/browser/automation/testing_automation_provider.h @@ -63,7 +63,7 @@ class TestingAutomationProvider : public AutomationProvider, virtual IPC::Channel::Mode GetChannelMode(bool use_named_interface); - // IPC::Channel::Listener: + // IPC::Listener: virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; virtual void OnChannelError() OVERRIDE; diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc index c1ab269..e277bf4 100644 --- a/chrome/browser/chromeos/login/webui_login_view.cc +++ b/chrome/browser/chromeos/login/webui_login_view.cc @@ -63,7 +63,7 @@ class SnifferObserver : public content::RenderViewHostObserver { virtual ~SnifferObserver() {} - // IPC::Channel::Listener implementation. + // IPC::Listener implementation. virtual bool OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(SnifferObserver, message) diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc index 5a73e14..04a4d69 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api.cc @@ -273,7 +273,7 @@ struct ExtensionWebRequestEventRouter::EventListener { std::string sub_event_name; RequestFilter filter; int extra_info_spec; - base::WeakPtr<IPC::Message::Sender> ipc_sender; + base::WeakPtr<IPC::Sender> ipc_sender; mutable std::set<uint64> blocked_requests; // Comparator to work with std::set. @@ -991,7 +991,7 @@ bool ExtensionWebRequestEventRouter::AddEventListener( const std::string& sub_event_name, const RequestFilter& filter, int extra_info_spec, - base::WeakPtr<IPC::Message::Sender> ipc_sender) { + base::WeakPtr<IPC::Sender> ipc_sender) { if (!IsWebRequestEvent(event_name)) return false; diff --git a/chrome/browser/extensions/api/web_request/web_request_api.h b/chrome/browser/extensions/api/web_request/web_request_api.h index 846381c..d25e326 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.h +++ b/chrome/browser/extensions/api/web_request/web_request_api.h @@ -19,7 +19,7 @@ #include "chrome/browser/extensions/extension_function.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/url_pattern_set.h" -#include "ipc/ipc_message.h" +#include "ipc/ipc_sender.h" #include "net/base/completion_callback.h" #include "net/base/network_delegate.h" #include "net/http/http_request_headers.h" @@ -238,7 +238,7 @@ class ExtensionWebRequestEventRouter { const std::string& sub_event_name, const RequestFilter& filter, int extra_info_spec, - base::WeakPtr<IPC::Message::Sender> ipc_sender); + base::WeakPtr<IPC::Sender> ipc_sender); // Removes the listener for the given sub-event. void RemoveEventListener( diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc index 79f5dfd1..1108e1b 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc @@ -77,7 +77,7 @@ bool Contains(const Collection& collection, const Key& key) { // A mock event router that responds to events with a pre-arranged queue of // Tasks. -class TestIPCSender : public IPC::Message::Sender { +class TestIPCSender : public IPC::Sender { public: typedef std::list<linked_ptr<IPC::Message> > SentMessages; @@ -98,7 +98,7 @@ class TestIPCSender : public IPC::Message::Sender { } private: - // IPC::Message::Sender + // IPC::Sender virtual bool Send(IPC::Message* message) { EXPECT_EQ(ExtensionMsg_MessageInvoke::ID, message->type()); diff --git a/chrome/browser/extensions/extension_event_router.cc b/chrome/browser/extensions/extension_event_router.cc index 07e0ee3..9969514 100644 --- a/chrome/browser/extensions/extension_event_router.cc +++ b/chrome/browser/extensions/extension_event_router.cc @@ -87,7 +87,7 @@ struct ExtensionEventRouter::ExtensionEvent { }; // static -void ExtensionEventRouter::DispatchEvent(IPC::Message::Sender* ipc_sender, +void ExtensionEventRouter::DispatchEvent(IPC::Sender* ipc_sender, const std::string& extension_id, const std::string& event_name, const std::string& event_args, diff --git a/chrome/browser/extensions/extension_event_router.h b/chrome/browser/extensions/extension_event_router.h index 42a649c..bbb3e22 100644 --- a/chrome/browser/extensions/extension_event_router.h +++ b/chrome/browser/extensions/extension_event_router.h @@ -15,7 +15,7 @@ #include "base/memory/ref_counted.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "ipc/ipc_message.h" +#include "ipc/ipc_sender.h" class GURL; class ExtensionHost; @@ -42,7 +42,7 @@ class ExtensionEventRouter : public content::NotificationObserver { // Sends an event via ipc_sender to the given extension. Can be called on // any thread. - static void DispatchEvent(IPC::Message::Sender* ipc_sender, + static void DispatchEvent(IPC::Sender* ipc_sender, const std::string& extension_id, const std::string& event_name, const std::string& event_args, diff --git a/chrome/browser/extensions/extension_function.cc b/chrome/browser/extensions/extension_function.cc index 614f342c..d8ab5b9 100644 --- a/chrome/browser/extensions/extension_function.cc +++ b/chrome/browser/extensions/extension_function.cc @@ -120,7 +120,7 @@ bool ExtensionFunction::HasOptionalArgument(size_t index) { } void ExtensionFunction::SendResponseImpl(base::ProcessHandle process, - IPC::Message::Sender* ipc_sender, + IPC::Sender* ipc_sender, int routing_id, bool success) { DCHECK(ipc_sender); diff --git a/chrome/browser/extensions/extension_function.h b/chrome/browser/extensions/extension_function.h index 4297606..b311e77 100644 --- a/chrome/browser/extensions/extension_function.h +++ b/chrome/browser/extensions/extension_function.h @@ -162,7 +162,7 @@ class ExtensionFunction // Common implementation for SendResponse. void SendResponseImpl(base::ProcessHandle process, - IPC::Message::Sender* ipc_sender, + IPC::Sender* ipc_sender, int routing_id, bool success); diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc index 39896f5..1ad8e28 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.cc +++ b/chrome/browser/extensions/extension_function_dispatcher.cc @@ -250,7 +250,7 @@ ExtensionFunction* ExtensionFunctionDispatcher::CreateExtensionFunction( const extensions::ProcessMap& process_map, extensions::ExtensionAPI* api, void* profile, - IPC::Message::Sender* ipc_sender, + IPC::Sender* ipc_sender, int routing_id) { if (!extension) { LOG(ERROR) << "Specified extension does not exist."; @@ -288,7 +288,7 @@ ExtensionFunction* ExtensionFunctionDispatcher::CreateExtensionFunction( // static void ExtensionFunctionDispatcher::SendAccessDenied( - IPC::Message::Sender* ipc_sender, int routing_id, int request_id) { + IPC::Sender* ipc_sender, int routing_id, int request_id) { ListValue empty_list; ipc_sender->Send(new ExtensionMsg_Response( routing_id, request_id, false, empty_list, diff --git a/chrome/browser/extensions/extension_function_dispatcher.h b/chrome/browser/extensions/extension_function_dispatcher.h index ed6548a..1f0f998 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.h +++ b/chrome/browser/extensions/extension_function_dispatcher.h @@ -11,7 +11,7 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/profiles/profile.h" -#include "ipc/ipc_message.h" +#include "ipc/ipc_sender.h" #include "googleurl/src/gurl.h" class ChromeRenderMessageFilter; @@ -120,12 +120,12 @@ class ExtensionFunctionDispatcher const extensions::ProcessMap& process_map, extensions::ExtensionAPI* api, void* profile, - IPC::Message::Sender* ipc_sender, + IPC::Sender* ipc_sender, int routing_id); // Helper to send an access denied error to the requesting renderer. Can be // called on any thread. - static void SendAccessDenied(IPC::Message::Sender* ipc_sender, + static void SendAccessDenied(IPC::Sender* ipc_sender, int routing_id, int request_id); diff --git a/chrome/browser/importer/external_process_importer_bridge.cc b/chrome/browser/importer/external_process_importer_bridge.cc index db305bc..b7c56cb 100644 --- a/chrome/browser/importer/external_process_importer_bridge.cc +++ b/chrome/browser/importer/external_process_importer_bridge.cc @@ -29,7 +29,7 @@ const int kNumFaviconsToSend = 100; ExternalProcessImporterBridge::ExternalProcessImporterBridge( const DictionaryValue& localized_strings, - IPC::Message::Sender* sender, + IPC::Sender* sender, base::TaskRunner* task_runner) : sender_(sender), task_runner_(task_runner) { diff --git a/chrome/browser/importer/external_process_importer_bridge.h b/chrome/browser/importer/external_process_importer_bridge.h index d7353ac..c0bf58b2 100644 --- a/chrome/browser/importer/external_process_importer_bridge.h +++ b/chrome/browser/importer/external_process_importer_bridge.h @@ -31,7 +31,7 @@ class ExternalProcessImporterBridge : public ImporterBridge { public: ExternalProcessImporterBridge( const base::DictionaryValue& localized_strings, - IPC::Message::Sender* sender, + IPC::Sender* sender, base::TaskRunner* task_runner); // Begin ImporterBridge implementation: @@ -76,7 +76,7 @@ class ExternalProcessImporterBridge : public ImporterBridge { // bundle isn't available to the external process. scoped_ptr<base::DictionaryValue> localized_strings_; - IPC::Message::Sender* sender_; + IPC::Sender* sender_; scoped_refptr<base::TaskRunner> task_runner_; DISALLOW_COPY_AND_ASSIGN(ExternalProcessImporterBridge); diff --git a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc index d609cc9..b1297ee 100644 --- a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc +++ b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc @@ -70,12 +70,12 @@ bool LaunchNSSDecrypterChildProcess(const FilePath& nss_path, // Method calls are sent over IPC and replies are read back into class // variables. // This class needs to be called on a single thread. -class FFDecryptorServerChannelListener : public IPC::Channel::Listener { +class FFDecryptorServerChannelListener : public IPC::Listener { public: FFDecryptorServerChannelListener() : got_result(false), sender_(NULL) {} - void SetSender(IPC::Message::Sender* sender) { + void SetSender(IPC::Sender* sender) { sender_ = sender; } @@ -121,7 +121,7 @@ class FFDecryptorServerChannelListener : public IPC::Channel::Listener { bool got_result; private: - IPC::Message::Sender* sender_; // weak + IPC::Sender* sender_; // weak }; FFUnitTestDecryptorProxy::FFUnitTestDecryptorProxy() @@ -219,12 +219,12 @@ string16 FFUnitTestDecryptorProxy::Decrypt(const std::string& crypt) { // Class to listen on the client side of the ipc channel, it calls through // to the NSSDecryptor and sends back a reply. -class FFDecryptorClientChannelListener : public IPC::Channel::Listener { +class FFDecryptorClientChannelListener : public IPC::Listener { public: FFDecryptorClientChannelListener() : sender_(NULL) {} - void SetSender(IPC::Message::Sender* sender) { + void SetSender(IPC::Sender* sender) { sender_ = sender; } @@ -259,7 +259,7 @@ class FFDecryptorClientChannelListener : public IPC::Channel::Listener { private: NSSDecryptor decryptor_; - IPC::Message::Sender* sender_; + IPC::Sender* sender_; }; // Entry function in child process. diff --git a/chrome/browser/pepper_flash_settings_manager.cc b/chrome/browser/pepper_flash_settings_manager.cc index 8e246fb..a82dcd3 100644 --- a/chrome/browser/pepper_flash_settings_manager.cc +++ b/chrome/browser/pepper_flash_settings_manager.cc @@ -30,7 +30,7 @@ using content::BrowserThread; class PepperFlashSettingsManager::Core - : public IPC::Channel::Listener, + : public IPC::Listener, public base::RefCountedThreadSafe<Core, BrowserThread::DeleteOnIOThread> { public: Core(PepperFlashSettingsManager* manager, @@ -52,7 +52,7 @@ class PepperFlashSettingsManager::Core PP_Flash_BrowserOperations_SettingType setting_type, const ppapi::FlashSiteSettings& sites); - // IPC::Channel::Listener implementation. + // IPC::Listener implementation. virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void OnChannelError() OVERRIDE; diff --git a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc index db2b975d..381bb6f 100644 --- a/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc +++ b/chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc @@ -77,7 +77,7 @@ void ShutdownTask() { g_service_process->Shutdown(); } -class TestStartupClientChannelListener : public IPC::Channel::Listener { +class TestStartupClientChannelListener : public IPC::Listener { public: virtual bool OnMessageReceived(const IPC::Message& message) { return false; } }; @@ -279,7 +279,7 @@ MULTIPROCESS_TEST_MAIN(CloudPrintMockService_StartEnabledExpectDisabled) { } class CloudPrintProxyPolicyStartupTest : public base::MultiProcessTest, - public IPC::Channel::Listener { + public IPC::Listener { public: CloudPrintProxyPolicyStartupTest(); ~CloudPrintProxyPolicyStartupTest(); @@ -293,7 +293,7 @@ class CloudPrintProxyPolicyStartupTest : public base::MultiProcessTest, bool Send(IPC::Message* message); void ShutdownAndWaitForExitWithTimeout(base::ProcessHandle handle); - // IPC::Channel::Listener implementation + // IPC::Listener implementation virtual bool OnMessageReceived(const IPC::Message& message) { return false; } virtual void OnChannelConnected(int32 peer_pid); diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc index a5153dd..e8f59b9 100644 --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc @@ -315,7 +315,7 @@ bool ChromeResourceDispatcherHostDelegate::ShouldForceDownloadResource( void ChromeResourceDispatcherHostDelegate::OnResponseStarted( net::URLRequest* request, content::ResourceResponse* response, - IPC::Message::Sender* sender) { + IPC::Sender* sender) { LoadTimingObserver::PopulateTimingInfo(request, response); const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request); diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h index 8c35999..72bbbfd 100644 --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h @@ -73,10 +73,9 @@ class ChromeResourceDispatcherHostDelegate int route_id) OVERRIDE; virtual bool ShouldForceDownloadResource( const GURL& url, const std::string& mime_type) OVERRIDE; - virtual void OnResponseStarted( - net::URLRequest* request, - content::ResourceResponse* response, - IPC::Message::Sender* sender) OVERRIDE; + virtual void OnResponseStarted(net::URLRequest* request, + content::ResourceResponse* response, + IPC::Sender* sender) OVERRIDE; virtual void OnRequestRedirected( net::URLRequest* request, content::ResourceResponse* response) OVERRIDE; diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc index 952defd..b83a10c 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc @@ -80,7 +80,7 @@ class PortalFrameLoadObserver : public content::RenderViewHostObserver { UTF8ToUTF16("paymentForm"))); } - // IPC::Channel::Listener implementation. + // IPC::Listener implementation. virtual bool OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(PortalFrameLoadObserver, message) diff --git a/chrome/common/extensions/extension_localization_peer.cc b/chrome/common/extensions/extension_localization_peer.cc index fa00999..05611512 100644 --- a/chrome/common/extensions/extension_localization_peer.cc +++ b/chrome/common/extensions/extension_localization_peer.cc @@ -16,7 +16,7 @@ ExtensionLocalizationPeer::ExtensionLocalizationPeer( webkit_glue::ResourceLoaderBridge::Peer* peer, - IPC::Message::Sender* message_sender, + IPC::Sender* message_sender, const GURL& request_url) : original_peer_(peer), message_sender_(message_sender), @@ -30,7 +30,7 @@ ExtensionLocalizationPeer::~ExtensionLocalizationPeer() { ExtensionLocalizationPeer* ExtensionLocalizationPeer::CreateExtensionLocalizationPeer( webkit_glue::ResourceLoaderBridge::Peer* peer, - IPC::Message::Sender* message_sender, + IPC::Sender* message_sender, const std::string& mime_type, const GURL& request_url) { // Return NULL if content is not text/css or it doesn't belong to extension diff --git a/chrome/common/extensions/extension_localization_peer.h b/chrome/common/extensions/extension_localization_peer.h index 346d06e..1784b64 100644 --- a/chrome/common/extensions/extension_localization_peer.h +++ b/chrome/common/extensions/extension_localization_peer.h @@ -8,7 +8,7 @@ #include <string> -#include "ipc/ipc_message.h" +#include "ipc/ipc_sender.h" #include "webkit/glue/resource_loader_bridge.h" // The ExtensionLocalizationPeer is a proxy to a @@ -25,7 +25,7 @@ class ExtensionLocalizationPeer static ExtensionLocalizationPeer* CreateExtensionLocalizationPeer( webkit_glue::ResourceLoaderBridge::Peer* peer, - IPC::Message::Sender* message_sender, + IPC::Sender* message_sender, const std::string& mime_type, const GURL& request_url); @@ -53,7 +53,7 @@ class ExtensionLocalizationPeer // Use CreateExtensionLocalizationPeer to create an instance. ExtensionLocalizationPeer( webkit_glue::ResourceLoaderBridge::Peer* peer, - IPC::Message::Sender* message_sender, + IPC::Sender* message_sender, const GURL& request_url); // Loads message catalogs, and replaces all __MSG_some_name__ templates within @@ -68,7 +68,7 @@ class ExtensionLocalizationPeer // Sends ExtensionHostMsg_GetMessageBundle message to the browser to fetch // message catalog. - IPC::Message::Sender* message_sender_; + IPC::Sender* message_sender_; // Buffer for incoming data. We wait until OnCompletedRequest before using it. std::string data_; diff --git a/chrome/common/extensions/extension_localization_peer_unittest.cc b/chrome/common/extensions/extension_localization_peer_unittest.cc index 06bd74e..135725d 100644 --- a/chrome/common/extensions/extension_localization_peer_unittest.cc +++ b/chrome/common/extensions/extension_localization_peer_unittest.cc @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/common/extensions/extension_message_bundle.h" #include "chrome/common/extensions/extension_localization_peer.h" -#include "ipc/ipc_message.h" +#include "ipc/ipc_sender.h" #include "ipc/ipc_sync_message.h" #include "net/base/net_errors.h" #include "net/url_request/url_request_status.h" @@ -36,7 +36,7 @@ void MessageDeleter(IPC::Message* message) { delete message; } -class MockIpcMessageSender : public IPC::Message::Sender { +class MockIpcMessageSender : public IPC::Sender { public: MockIpcMessageSender() { ON_CALL(*this, Send(_)) diff --git a/chrome/nacl/nacl_broker_listener.h b/chrome/nacl/nacl_broker_listener.h index 61e16c6..19c60c4 100644 --- a/chrome/nacl/nacl_broker_listener.h +++ b/chrome/nacl/nacl_broker_listener.h @@ -13,14 +13,14 @@ // The BrokerThread class represents the thread that handles the messages from // the browser process and starts NaCl loader processes. -class NaClBrokerListener : public IPC::Channel::Listener { +class NaClBrokerListener : public IPC::Listener { public: NaClBrokerListener(); ~NaClBrokerListener(); void Listen(); - // IPC::Channel::Listener implementation. + // IPC::Listener implementation. virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; virtual void OnChannelError() OVERRIDE; diff --git a/chrome/nacl/nacl_helper_linux.cc b/chrome/nacl/nacl_helper_linux.cc index a187538..a668ec4 100644 --- a/chrome/nacl/nacl_helper_linux.cc +++ b/chrome/nacl/nacl_helper_linux.cc @@ -8,6 +8,7 @@ #include <errno.h> #include <link.h> +#include <stdio.h> #include <stdlib.h> #include <sys/socket.h> #include <sys/types.h> diff --git a/chrome/nacl/nacl_ipc_adapter.h b/chrome/nacl/nacl_ipc_adapter.h index 2c82356..12500cd 100644 --- a/chrome/nacl/nacl_ipc_adapter.h +++ b/chrome/nacl/nacl_ipc_adapter.h @@ -35,7 +35,7 @@ struct NaClDesc; // This object must be threadsafe since the nacl environment determines which // thread every function is called on. class NaClIPCAdapter : public base::RefCountedThreadSafe<NaClIPCAdapter>, - public IPC::Channel::Listener { + public IPC::Listener { public: // Chrome's IPC message format varies by platform, NaCl's does not. In // particular, the header has some extra fields on Posix platforms. Since diff --git a/chrome/nacl/nacl_listener.h b/chrome/nacl/nacl_listener.h index 2572db8..50daa34 100644 --- a/chrome/nacl/nacl_listener.h +++ b/chrome/nacl/nacl_listener.h @@ -12,7 +12,7 @@ #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" #include "chrome/common/nacl_types.h" -#include "ipc/ipc_channel.h" +#include "ipc/ipc_listener.h" namespace IPC { class SyncChannel; @@ -21,7 +21,7 @@ class SyncMessageFilter; // The NaClListener is an IPC channel listener that waits for a // request to start a NaCl module. -class NaClListener : public IPC::Channel::Listener { +class NaClListener : public IPC::Listener { public: NaClListener(); virtual ~NaClListener(); diff --git a/chrome/renderer/extensions/app_bindings.h b/chrome/renderer/extensions/app_bindings.h index 2bab2a6..e490f4e 100644 --- a/chrome/renderer/extensions/app_bindings.h +++ b/chrome/renderer/extensions/app_bindings.h @@ -27,7 +27,7 @@ class AppBindings : public ChromeV8Extension, public ChromeV8ExtensionHandler { ChromeV8Context* context); private: - // IPC::Channel::Listener + // IPC::Listener virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; v8::Handle<v8::Value> GetIsInstalled(const v8::Arguments& args); diff --git a/chrome/renderer/extensions/app_window_custom_bindings.cc b/chrome/renderer/extensions/app_window_custom_bindings.cc index 64c43d8..48027a1 100644 --- a/chrome/renderer/extensions/app_window_custom_bindings.cc +++ b/chrome/renderer/extensions/app_window_custom_bindings.cc @@ -73,9 +73,9 @@ v8::Handle<v8::Value> AppWindowCustomBindings::GetView( // TODO(jeremya): there exists a direct map of routing_id -> RenderView as // ChildThread::current()->ResolveRoute(), but ResolveRoute returns an - // IPC::Channel::Listener*, which RenderView doesn't inherit from - // (RenderViewImpl does, indirectly, via RenderWidget, but the link isn't - // exposed outside of content/.) + // IPC::Listener*, which RenderView doesn't inherit from (RenderViewImpl + // does, indirectly, via RenderWidget, but the link isn't exposed outside of + // content/.) FindViewByID view_finder(view_id); content::RenderView::ForEach(&view_finder); content::RenderView* view = view_finder.view(); diff --git a/chrome/renderer/extensions/chrome_v8_extension_handler.h b/chrome/renderer/extensions/chrome_v8_extension_handler.h index 301b9f6..37d6bde 100644 --- a/chrome/renderer/extensions/chrome_v8_extension_handler.h +++ b/chrome/renderer/extensions/chrome_v8_extension_handler.h @@ -9,7 +9,7 @@ #include <string> #include "base/basictypes.h" -#include "ipc/ipc_channel.h" +#include "ipc/ipc_listener.h" #include "v8/include/v8.h" class ChromeV8Context; @@ -17,11 +17,11 @@ class ChromeV8Context; // Base class for context-scoped handlers used with ChromeV8Extension. // TODO(koz): Rename/refactor this somehow. Maybe just pull it into // ChromeV8Extension. -class ChromeV8ExtensionHandler : public IPC::Channel::Listener { +class ChromeV8ExtensionHandler : public IPC::Listener { public: virtual ~ChromeV8ExtensionHandler(); - // IPC::Channel::Listener + // IPC::Listener virtual bool OnMessageReceived(const IPC::Message& message) = 0; protected: diff --git a/chrome/renderer/extensions/webstore_bindings.h b/chrome/renderer/extensions/webstore_bindings.h index 33ac48e..447cec4 100644 --- a/chrome/renderer/extensions/webstore_bindings.h +++ b/chrome/renderer/extensions/webstore_bindings.h @@ -21,7 +21,7 @@ class WebstoreBindings : public ChromeV8Extension, explicit WebstoreBindings(ExtensionDispatcher* dispatcher, ChromeV8Context* context); - // IPC::Channel::Listener + // IPC::Listener virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: diff --git a/chrome/renderer/external_host_bindings.cc b/chrome/renderer/external_host_bindings.cc index 479e175..e0cbdb3 100644 --- a/chrome/renderer/external_host_bindings.cc +++ b/chrome/renderer/external_host_bindings.cc @@ -16,8 +16,7 @@ using WebKit::WebBindings; using webkit_glue::CppArgumentList; using webkit_glue::CppVariant; -ExternalHostBindings::ExternalHostBindings(IPC::Message::Sender* sender, - int routing_id) +ExternalHostBindings::ExternalHostBindings(IPC::Sender* sender, int routing_id) : frame_(NULL), sender_(sender), routing_id_(routing_id) { BindCallback("postMessage", base::Bind(&ExternalHostBindings::PostMessage, base::Unretained(this))); diff --git a/chrome/renderer/external_host_bindings.h b/chrome/renderer/external_host_bindings.h index 6f98925..2fcdbb8 100644 --- a/chrome/renderer/external_host_bindings.h +++ b/chrome/renderer/external_host_bindings.h @@ -6,7 +6,7 @@ #define CHROME_RENDERER_EXTERNAL_HOST_BINDINGS_H_ #pragma once -#include "ipc/ipc_message.h" +#include "ipc/ipc_sender.h" #include "webkit/glue/cpp_bound_class.h" // ExternalHostBindings is the class backing the "externalHost" object @@ -16,7 +16,7 @@ // postMessage(String message[, String target]); class ExternalHostBindings : public webkit_glue::CppBoundClass { public: - ExternalHostBindings(IPC::Message::Sender* sender, int routing_id); + ExternalHostBindings(IPC::Sender* sender, int routing_id); virtual ~ExternalHostBindings(); // Invokes the registered onmessage handler. @@ -40,7 +40,7 @@ class ExternalHostBindings : public webkit_glue::CppBoundClass { webkit_glue::CppVariant on_message_handler_; WebKit::WebFrame* frame_; - IPC::Message::Sender* sender_; + IPC::Sender* sender_; int routing_id_; DISALLOW_COPY_AND_ASSIGN(ExternalHostBindings); diff --git a/chrome/renderer/pepper/ppb_nacl_private_impl.cc b/chrome/renderer/pepper/ppb_nacl_private_impl.cc index 61fa839..b646065 100644 --- a/chrome/renderer/pepper/ppb_nacl_private_impl.cc +++ b/chrome/renderer/pepper/ppb_nacl_private_impl.cc @@ -31,7 +31,7 @@ PP_Bool LaunchSelLdr(PP_Instance instance, const char* alleged_url, int socket_count, void* imc_handles) { std::vector<nacl::FileDescriptor> sockets; - IPC::Message::Sender* sender = content::RenderThread::Get(); + IPC::Sender* sender = content::RenderThread::Get(); if (sender == NULL) sender = g_background_thread_sender.Pointer()->get(); diff --git a/chrome/service/service_ipc_server.h b/chrome/service/service_ipc_server.h index 980112d..a4c7513 100644 --- a/chrome/service/service_ipc_server.h +++ b/chrome/service/service_ipc_server.h @@ -9,20 +9,20 @@ #include "base/memory/scoped_ptr.h" #include "ipc/ipc_channel_handle.h" +#include "ipc/ipc_listener.h" #include "ipc/ipc_sync_channel.h" #include "ipc/ipc_sync_message_filter.h" -#include "ipc/ipc_message.h" +#include "ipc/ipc_sender.h" // This class handles IPC commands for the service process. -class ServiceIPCServer : public IPC::Channel::Listener, - public IPC::Message::Sender { +class ServiceIPCServer : public IPC::Listener, public IPC::Sender { public: explicit ServiceIPCServer(const IPC::ChannelHandle& handle); virtual ~ServiceIPCServer(); bool Init(); - // IPC::Message::Sender implementation. + // IPC::Sender implementation. virtual bool Send(IPC::Message* msg) OVERRIDE; IPC::SyncChannel* channel() { return channel_.get(); } @@ -37,7 +37,7 @@ class ServiceIPCServer : public IPC::Channel::Listener, private: friend class MockServiceIPCServer; - // IPC::Channel::Listener implementation. + // IPC::Listener implementation. virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; virtual void OnChannelError() OVERRIDE; diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h index 80c34ef..b218cd9 100644 --- a/chrome/test/automation/automation_proxy.h +++ b/chrome/test/automation/automation_proxy.h @@ -23,7 +23,7 @@ #include "chrome/test/automation/browser_proxy.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_channel_proxy.h" -#include "ipc/ipc_message.h" +#include "ipc/ipc_sender.h" #include "ipc/ipc_sync_channel.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/native_widget_types.h" @@ -35,7 +35,7 @@ struct ExternalTabSettings; // This is an interface that AutomationProxy-related objects can use to // access the message-sending abilities of the Proxy. -class AutomationMessageSender : public IPC::Message::Sender { +class AutomationMessageSender : public IPC::Sender { public: // Sends a message synchronously; it doesn't return until a response has been // received or a timeout has expired. @@ -53,8 +53,7 @@ class AutomationMessageSender : public IPC::Message::Sender { // This is the interface that external processes can use to interact with // a running instance of the app. -class AutomationProxy : public IPC::Channel::Listener, - public AutomationMessageSender { +class AutomationProxy : public IPC::Listener, public AutomationMessageSender { public: AutomationProxy(int action_timeout_ms, bool disconnect_on_failure); virtual ~AutomationProxy(); |