diff options
Diffstat (limited to 'chrome/browser/automation')
11 files changed, 17 insertions, 18 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; |