From b44f8adbee594abffab0246815a0614675adf07b Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Fri, 15 Jun 2012 20:52:58 +0000 Subject: Rename IPC::Channel and IPC::Sender in src/chrome. Changes code in chrome to use the new names over the old now-typedefed-for-compat ones. BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10553010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142474 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/automation/automation_browser_tracker.cc | 3 +-- chrome/browser/automation/automation_browser_tracker.h | 2 +- .../browser/automation/automation_resource_message_filter.h | 4 ++-- chrome/browser/automation/automation_resource_tracker.cc | 2 +- chrome/browser/automation/automation_resource_tracker.h | 10 +++++----- chrome/browser/automation/automation_tab_tracker.cc | 3 ++- chrome/browser/automation/automation_tab_tracker.h | 2 +- chrome/browser/automation/automation_window_tracker.cc | 3 +-- chrome/browser/automation/automation_window_tracker.h | 2 +- chrome/browser/automation/chrome_frame_automation_provider.h | 2 +- chrome/browser/automation/testing_automation_provider.h | 2 +- chrome/browser/chromeos/login/webui_login_view.cc | 2 +- chrome/browser/extensions/api/web_request/web_request_api.cc | 4 ++-- chrome/browser/extensions/api/web_request/web_request_api.h | 4 ++-- .../extensions/api/web_request/web_request_api_unittest.cc | 4 ++-- chrome/browser/extensions/extension_event_router.cc | 2 +- chrome/browser/extensions/extension_event_router.h | 4 ++-- chrome/browser/extensions/extension_function.cc | 2 +- chrome/browser/extensions/extension_function.h | 2 +- chrome/browser/extensions/extension_function_dispatcher.cc | 4 ++-- chrome/browser/extensions/extension_function_dispatcher.h | 6 +++--- chrome/browser/importer/external_process_importer_bridge.cc | 2 +- chrome/browser/importer/external_process_importer_bridge.h | 4 ++-- .../browser/importer/firefox_importer_unittest_utils_mac.cc | 12 ++++++------ chrome/browser/pepper_flash_settings_manager.cc | 4 ++-- .../test/cloud_print_proxy_process_browsertest.cc | 6 +++--- .../chrome_resource_dispatcher_host_delegate.cc | 2 +- .../renderer_host/chrome_resource_dispatcher_host_delegate.h | 7 +++---- chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc | 2 +- 29 files changed, 53 insertions(+), 55 deletions(-) (limited to 'chrome/browser') 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(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 { 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 { // 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 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(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 { 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(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 { 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_sender; + base::WeakPtr ipc_sender; mutable std::set 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_sender) { + base::WeakPtr 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_sender); + base::WeakPtr 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 > 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 localized_strings_; - IPC::Message::Sender* sender_; + IPC::Sender* sender_; scoped_refptr 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 { 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) -- cgit v1.1