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 e6e21088ef29af26628d5b224bee06521114fb1a..dea2c88c37d89940f495810411836156aac20d6c 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" |
@@ -27,6 +28,7 @@ |
#include "content/public/common/frame_navigate_params.h" |
#include "mojo/public/cpp/bindings/binding.h" |
#include "third_party/WebKit/public/platform/modules/presentation/presentation.mojom.h" |
+#include "url/gurl.h" |
namespace content { |
@@ -72,11 +74,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, |
@@ -150,21 +152,22 @@ class CONTENT_EXPORT PresentationServiceImpl |
PresentationServiceDelegate* delegate); |
// PresentationService implementation. |
- void SetDefaultPresentationURL(const std::string& url) override; |
+ void SetDefaultPresentationUrls( |
+ const std::vector<GURL>& presentation_urls) override; |
void SetClient(blink::mojom::PresentationServiceClientPtr client) override; |
- void ListenForScreenAvailability(const std::string& url) override; |
- void StopListeningForScreenAvailability(const std::string& url) override; |
- void StartSession(const std::string& presentation_url, |
+ void ListenForScreenAvailability(const GURL& url) override; |
+ void StopListeningForScreenAvailability(const GURL& url) override; |
+ void StartSession(const std::vector<GURL>& presentation_urls, |
const NewSessionCallback& callback) override; |
- void JoinSession(const std::string& presentation_url, |
+ void JoinSession(const std::vector<GURL>& presentation_urls, |
const base::Optional<std::string>& presentation_id, |
const NewSessionCallback& callback) override; |
void SendSessionMessage(blink::mojom::PresentationSessionInfoPtr session_info, |
blink::mojom::SessionMessagePtr session_message, |
const SendSessionMessageCallback& callback) override; |
- void CloseConnection(const std::string& presentation_url, |
+ void CloseConnection(const GURL& presentation_url, |
const std::string& presentation_id) override; |
- void Terminate(const std::string& presentation_url, |
+ void Terminate(const GURL& presentation_url, |
const std::string& presentation_id) override; |
void ListenForSessionMessages( |
blink::mojom::PresentationSessionInfoPtr session) override; |
@@ -253,7 +256,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>>; |