Chromium Code Reviews| Index: content/public/browser/presentation_service_delegate.h |
| diff --git a/content/public/browser/presentation_service_delegate.h b/content/public/browser/presentation_service_delegate.h |
| index 3588faf1ae883ce04c9c506b3d3e572f44252869..fddc1ec3e73bf125910af712d8ac45410234fda3 100644 |
| --- a/content/public/browser/presentation_service_delegate.h |
| +++ b/content/public/browser/presentation_service_delegate.h |
| @@ -14,6 +14,7 @@ |
| #include "content/common/content_export.h" |
| #include "content/public/browser/presentation_session.h" |
| #include "content/public/browser/presentation_session_message.h" |
| +#include "third_party/WebKit/public/platform/modules/presentation/presentation.mojom.h" |
| class GURL; |
| @@ -49,9 +50,15 @@ struct PresentationConnectionStateChangeInfo { |
| using PresentationConnectionStateChangedCallback = |
| base::Callback<void(const PresentationConnectionStateChangeInfo&)>; |
| -// An interface implemented by embedders to handle presentation API calls |
| -// forwarded from PresentationServiceImpl. |
| -class CONTENT_EXPORT PresentationServiceDelegate { |
| +using PresentationConnectionPtr = blink::mojom::PresentationConnectionPtr; |
| + |
| +using ReceiverConnectionAvailableCallback = |
| + base::Callback<void(const content::PresentationSessionInfo&, |
| + PresentationConnectionPtr&&)>; |
| + |
| +// Base class for ControllerPresentationServiceDelegate and |
| +// ReceiverPresentationServiceDelegate. |
| +class PresentationServiceDelegateBase { |
| public: |
| // Observer interface to listen for changes to PresentationServiceDelegate. |
| class CONTENT_EXPORT Observer { |
| @@ -63,10 +70,6 @@ class CONTENT_EXPORT PresentationServiceDelegate { |
| virtual ~Observer() {} |
| }; |
| - using SendMessageCallback = base::Callback<void(bool)>; |
| - |
| - virtual ~PresentationServiceDelegate() {} |
| - |
| // Registers an observer associated with frame with |render_process_id| |
| // and |render_frame_id| with this class to listen for updates. |
| // This class does not own the observer. |
| @@ -81,6 +84,22 @@ class CONTENT_EXPORT PresentationServiceDelegate { |
| // The observer will no longer receive updates. |
| virtual void RemoveObserver(int render_process_id, int render_frame_id) = 0; |
| + // Resets the presentation state for the frame given by |render_process_id| |
| + // and |render_frame_id|. |
| + // This unregisters all listeners associated with the given frame, and clears |
| + // the default presentation URL and ID set for the frame. |
| + virtual void Reset(int render_process_id, int render_frame_id) = 0; |
| +}; |
| + |
| +// An interface implemented by embedders to handle presentation API calls |
| +// forwarded from PresentationServiceImpl. |
| +class CONTENT_EXPORT ControllerPresentationServiceDelegate |
| + : public PresentationServiceDelegateBase { |
| + public: |
| + using SendMessageCallback = base::Callback<void(bool)>; |
| + |
| + virtual ~ControllerPresentationServiceDelegate() {} |
| + |
| // Registers |listener| to continuously listen for |
| // availability updates for a presentation URL, originated from the frame |
| // given by |render_process_id| and |render_frame_id|. |
| @@ -101,14 +120,6 @@ class CONTENT_EXPORT PresentationServiceDelegate { |
| int render_frame_id, |
| PresentationScreenAvailabilityListener* listener) = 0; |
| - // Resets the presentation state for the frame given by |render_process_id| |
| - // and |render_frame_id|. |
| - // This unregisters all listeners associated with the given frame, and clears |
| - // the default presentation URL and ID set for the frame. |
| - virtual void Reset( |
| - int render_process_id, |
| - int render_frame_id) = 0; |
| - |
| // Sets the default presentation URLs for frame given by |render_process_id| |
| // and |render_frame_id|. When the default presentation is started on this |
| // frame, |callback| will be invoked with the corresponding |
| @@ -202,6 +213,32 @@ class CONTENT_EXPORT PresentationServiceDelegate { |
| int render_frame_id, |
| const PresentationSessionInfo& connection, |
| const PresentationConnectionStateChangedCallback& state_changed_cb) = 0; |
| + |
| + // Connect |connection| owned by the controlling frame to the offscreen |
| + // presentation represented by |session|. |
| + // |render_process_id|, |render_frame_id|: ID of originating frame. |
| + // |connection|: Pointer to controller's presentation connection, |
| + // ownership passed from controlling frame to the offscreen presentation. |
| + virtual void RegisterOffscreenPresentationConnection( |
|
mark a. foltz
2016/10/21 00:53:02
ConnectToOffscreenPresentation?
zhaobin
2016/10/22 02:44:13
Done.
|
| + int render_process_id, |
| + int render_frame_id, |
| + const PresentationSessionInfo& session, |
| + PresentationConnectionPtr connection) = 0; |
| +}; |
| + |
| +// An interface implemented by embedders to handle presentation API calls |
| +// forwarded from receiver PresentationServiceImpl. |
|
mark a. foltz
2016/10/21 00:53:02
handle PresentationService calls from a presentati
zhaobin
2016/10/22 02:44:13
Done.
|
| +class CONTENT_EXPORT ReceiverPresentationServiceDelegate |
| + : public PresentationServiceDelegateBase { |
| + public: |
| + // Registers a callback from the embedder when an offscreeen presentation has |
| + // been |
| + // successfully started. |
|
mark a. foltz
2016/10/21 00:53:02
Can you rewrap this comment?
zhaobin
2016/10/22 02:44:13
Done.
|
| + // |receiver_available_callback|: Invoked when successfully starting a |
| + // offscreen presentation session. |
| + virtual void RegisterReceiverAvailableCallback( |
|
mark a. foltz
2016/10/21 00:53:02
RegisterReceiverConnectionAvailableCallback
zhaobin
2016/10/22 02:44:13
Done.
|
| + const content::ReceiverConnectionAvailableCallback& |
| + receiver_available_callback) = 0; |
| }; |
| } // namespace content |