Index: chrome/browser/media/router/offscreen_presentation_manager.h |
diff --git a/chrome/browser/media/router/offscreen_presentation_manager.h b/chrome/browser/media/router/offscreen_presentation_manager.h |
index 9871a580fff37945b571baa2da03b83b6b51e32e..bde434230a3473ff7735b9f3f17ad13bd15d646c 100644 |
--- a/chrome/browser/media/router/offscreen_presentation_manager.h |
+++ b/chrome/browser/media/router/offscreen_presentation_manager.h |
@@ -18,7 +18,9 @@ |
#include "components/keyed_service/core/keyed_service.h" |
#include "content/public/browser/presentation_service_delegate.h" |
-class GURL; |
+namespace content { |
+struct PresentationInfo; |
+} |
namespace media_router { |
// Manages all offscreen presentations started in the associated Profile and |
@@ -36,7 +38,7 @@ namespace media_router { |
// OffscreenPresentationManager* manager = |
// OffscreenPresentationManagerFactory::GetOrCreateForBrowserContext( |
// web_contents_->GetBrowserContext()); |
-// manager->OnOffscreenPresentationReceiverCreated(presentation_id, |
+// manager->OnOffscreenPresentationReceiverCreated(presentation_info, |
// base::Bind(&PresentationServiceImpl::OnReceiverConnectionAvailable)); |
// |
// Controlling frame establishes connection with the receiver side, resulting |
@@ -46,8 +48,9 @@ namespace media_router { |
// PresentationServiceImpl::OnReceiverConnectionAvailable. |
// |
// manager->RegisterOffscreenPresentationController( |
-// presentation_id, controller_frame_id, controller_connection_ptr, |
-// receiver_connection_request); |
+// presentation_info, |
+// std::move(controller_connection_ptr, |
+// std::move(receiver_connection_request)); |
// |
// Invoked on receiver's PresentationServiceImpl when controller connection is |
// established. |
@@ -77,8 +80,9 @@ namespace media_router { |
// |message|: Text message to be sent. |
// PresentationConnctionPtr::SendString( |
// const blink::WebString& message) { |
-// target_connection_->OnConnectionMessageReceived( |
-// std::move(connection_message)); |
+// target_connection_->OnMessage( |
+// content::PresentationConnectionMessage(message.Utf8()), |
+// base::Bind(&OnMessageReceived)); |
// } |
// |
// A controller or receiver leaves the offscreen presentation (e.g., due to |
@@ -109,8 +113,7 @@ class OffscreenPresentationManager : public KeyedService { |
// this class. Ownership is transferred to presentation receiver via |
// |receiver_callback| passed below. |
virtual void RegisterOffscreenPresentationController( |
- const std::string& presentation_id, |
- const GURL& presentation_url, |
+ const content::PresentationInfo& presentation_info, |
const RenderFrameHostId& render_frame_id, |
content::PresentationConnectionPtr controller_connection_ptr, |
content::PresentationConnectionRequest receiver_connection_request, |
@@ -125,11 +128,9 @@ class OffscreenPresentationManager : public KeyedService { |
const std::string& presentation_id, |
const RenderFrameHostId& render_frame_id); |
- // Registers |receiver_callback| to presentation with |presentation_id| and |
- // |presentation_url|. |
+ // Registers |receiver_callback| to presentation with |presentation_info|. |
virtual void OnOffscreenPresentationReceiverCreated( |
- const std::string& presentation_id, |
- const GURL& presentation_url, |
+ const content::PresentationInfo& presentation_info, |
const content::ReceiverConnectionAvailableCallback& receiver_callback); |
// Unregisters ReceiverConnectionAvailableCallback associated with |
@@ -153,8 +154,8 @@ class OffscreenPresentationManager : public KeyedService { |
// receiver. |
class OffscreenPresentation { |
public: |
- OffscreenPresentation(const std::string& presentation_id, |
- const GURL& presentation_url); |
+ explicit OffscreenPresentation( |
+ const content::PresentationInfo& presentation_info); |
~OffscreenPresentation(); |
// Register controller with |render_frame_id|. If |receiver_callback_| has |
@@ -188,8 +189,7 @@ class OffscreenPresentationManager : public KeyedService { |
// controllers. |
bool IsValid() const; |
- const std::string presentation_id_; |
- const GURL presentation_url_; |
+ const content::PresentationInfo presentation_info_; |
base::Optional<MediaRoute> route_; |
// Callback to invoke whenever a receiver connection is available. |
@@ -234,11 +234,9 @@ class OffscreenPresentationManager : public KeyedService { |
using OffscreenPresentationMap = |
std::map<std::string, std::unique_ptr<OffscreenPresentation>>; |
- // Creates an offscreen presentation with |presentation_id| and |
- // |presentation_url|. |
+ // Creates an offscreen presentation with |presentation_info|. |
OffscreenPresentation* GetOrCreateOffscreenPresentation( |
- const std::string& presentation_id, |
- const GURL& presentation_url); |
+ const content::PresentationInfo& presentation_info); |
// Maps from presentation ID to OffscreenPresentation. |
OffscreenPresentationMap offscreen_presentations_; |