| Index: content/browser/presentation/presentation_service_impl.h
|
| diff --git a/content/browser/presentation/presentation_service_impl.h b/content/browser/presentation/presentation_service_impl.h
|
| index 2bdc3e9029b4cc9b4334bf8576ffe27930700b7d..ec58c905757f5d850cc3f555bb37604b2115f0ad 100644
|
| --- a/content/browser/presentation/presentation_service_impl.h
|
| +++ b/content/browser/presentation/presentation_service_impl.h
|
| @@ -9,6 +9,7 @@
|
| #include <map>
|
| #include <memory>
|
| #include <string>
|
| +#include <vector>
|
|
|
| #include "base/callback.h"
|
| #include "base/compiler_specific.h"
|
| @@ -71,11 +72,11 @@ class CONTENT_EXPORT PresentationServiceImpl
|
| OtherRenderFrameDeleted);
|
| FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest, DelegateFails);
|
| FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
|
| - SetDefaultPresentationUrl);
|
| + SetDefaultPresentationUrls);
|
| FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
|
| - SetSameDefaultPresentationUrl);
|
| + SetSameDefaultPresentationUrls);
|
| FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
|
| - ClearDefaultPresentationUrl);
|
| + ClearDefaultPresentationUrls);
|
| FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
|
| ListenForDefaultSessionStart);
|
| FRIEND_TEST_ALL_PREFIXES(PresentationServiceImplTest,
|
| @@ -149,17 +150,16 @@ class CONTENT_EXPORT PresentationServiceImpl
|
| PresentationServiceDelegate* delegate);
|
|
|
| // PresentationService implementation.
|
| - void SetDefaultPresentationURL(const mojo::String& url) override;
|
| + void SetDefaultPresentationUrls(
|
| + mojo::Array<mojo::String> presentation_urls) override;
|
| void SetClient(blink::mojom::PresentationServiceClientPtr client) override;
|
| void ListenForScreenAvailability(const mojo::String& url) override;
|
| void StopListeningForScreenAvailability(const mojo::String& url) override;
|
| - void StartSession(
|
| - const mojo::String& presentation_url,
|
| - const NewSessionCallback& callback) override;
|
| - void JoinSession(
|
| - const mojo::String& presentation_url,
|
| - const mojo::String& presentation_id,
|
| - const NewSessionCallback& callback) override;
|
| + void StartSession(mojo::Array<mojo::String> presentation_urls,
|
| + const NewSessionCallback& callback) override;
|
| + void JoinSession(mojo::Array<mojo::String> presentation_urls,
|
| + const mojo::String& presentation_id,
|
| + const NewSessionCallback& callback) override;
|
| void SendSessionMessage(blink::mojom::PresentationSessionInfoPtr session_info,
|
| blink::mojom::SessionMessagePtr session_message,
|
| const SendSessionMessageCallback& callback) override;
|
| @@ -254,7 +254,7 @@ class CONTENT_EXPORT PresentationServiceImpl
|
| // availability) to.
|
| blink::mojom::PresentationServiceClientPtr client_;
|
|
|
| - std::string default_presentation_url_;
|
| + std::vector<std::string> default_presentation_urls_;
|
|
|
| using ScreenAvailabilityListenerMap =
|
| std::map<std::string, std::unique_ptr<ScreenAvailabilityListenerImpl>>;
|
|
|