| Index: third_party/WebKit/public/platform/modules/presentation/WebPresentationClient.h
|
| diff --git a/third_party/WebKit/public/platform/modules/presentation/WebPresentationClient.h b/third_party/WebKit/public/platform/modules/presentation/WebPresentationClient.h
|
| index 024553aba47cee8d7b2f3c78446709810be1ccef..7b1cb007ceced9a36c2287a4a67ae6d24ccded71 100644
|
| --- a/third_party/WebKit/public/platform/modules/presentation/WebPresentationClient.h
|
| +++ b/third_party/WebKit/public/platform/modules/presentation/WebPresentationClient.h
|
| @@ -16,6 +16,7 @@ class WebPresentationAvailabilityObserver;
|
| class WebPresentationController;
|
| class WebPresentationConnectionClient;
|
| class WebString;
|
| +class WebURL;
|
| struct WebPresentationError;
|
| template <typename T>
|
| class WebVector;
|
| @@ -29,7 +30,6 @@ using WebPresentationConnectionClientCallbacks = WebCallbacks<std::unique_ptr<We
|
| using WebPresentationAvailabilityCallbacks = WebCallbacks<bool, const WebPresentationError&>;
|
|
|
| // The implementation the embedder has to provide for the Presentation API to work.
|
| -// TODO(crbug.com/632623): Use WebURL instead of WebString in this API.
|
| class WebPresentationClient {
|
| public:
|
| virtual ~WebPresentationClient() { }
|
| @@ -39,34 +39,34 @@ public:
|
|
|
| // Called when the frame requests to start a new session.
|
| // The ownership of the |callbacks| argument is transferred to the embedder.
|
| - virtual void startSession(const WebVector<WebString>& presentationUrls, WebPresentationConnectionClientCallbacks*) = 0;
|
| + virtual void startSession(const WebVector<WebURL>& presentationUrls, WebPresentationConnectionClientCallbacks*) = 0;
|
|
|
| // Called when the frame requests to join an existing session.
|
| // The ownership of the |callbacks| argument is transferred to the embedder.
|
| - virtual void joinSession(const WebVector<WebString>& presentationUrls, const WebString& presentationId, WebPresentationConnectionClientCallbacks*) = 0;
|
| + virtual void joinSession(const WebVector<WebURL>& presentationUrls, const WebString& presentationId, WebPresentationConnectionClientCallbacks*) = 0;
|
|
|
| // Called when the frame requests to send String message to an existing session.
|
|
|
| - virtual void sendString(const WebString& presentationUrl, const WebString& presentationId, const WebString& message) = 0;
|
| + virtual void sendString(const WebURL& presentationUrl, const WebString& presentationId, const WebString& message) = 0;
|
|
|
| // Called when the frame requests to send ArrayBuffer/View data to an existing session.
|
| // Embedder copies the |data| and the ownership is not transferred.
|
| - virtual void sendArrayBuffer(const WebString& presentationUrl, const WebString& presentationId, const uint8_t* data, size_t length) = 0;
|
| + virtual void sendArrayBuffer(const WebURL& presentationUrl, const WebString& presentationId, const uint8_t* data, size_t length) = 0;
|
|
|
| // Called when the frame requests to send Blob data to an existing session.
|
| // Embedder copies the |data| and the ownership is not transferred.
|
| - virtual void sendBlobData(const WebString& presentationUrl, const WebString& presentationId, const uint8_t* data, size_t length) = 0;
|
| + virtual void sendBlobData(const WebURL& presentationUrl, const WebString& presentationId, const uint8_t* data, size_t length) = 0;
|
|
|
| // Called when the frame requests to close an existing session.
|
| - virtual void closeSession(const WebString& presentationUrl, const WebString& presentationId) = 0;
|
| + virtual void closeSession(const WebURL& presentationUrl, const WebString& presentationId) = 0;
|
|
|
| // Called when the frame requests to terminate an existing session.
|
| - virtual void terminateSession(const WebString& presentationUrl, const WebString& presentationId) = 0;
|
| + virtual void terminateSession(const WebURL& presentationUrl, const WebString& presentationId) = 0;
|
|
|
| // Called when the frame wants to know the availability of a presentation
|
| // display for |availabilityUrl|. The ownership of the callbacks argument
|
| // is transferred to the embedder.
|
| - virtual void getAvailability(const WebString& availabilityUrl, WebPresentationAvailabilityCallbacks*) = 0;
|
| + virtual void getAvailability(const WebURL& availabilityUrl, WebPresentationAvailabilityCallbacks*) = 0;
|
|
|
| // Start listening to changes in presentation displays availability. The
|
| // observer will be notified in case of a change. The observer is
|
| @@ -79,7 +79,7 @@ public:
|
|
|
| // Called when a defaultRequest has been set. It sends the url associated
|
| // with it for the embedder.
|
| - virtual void setDefaultPresentationUrls(const WebVector<WebString>&) = 0;
|
| + virtual void setDefaultPresentationUrls(const WebVector<WebURL>&) = 0;
|
| };
|
|
|
| } // namespace blink
|
|
|