Index: chrome/browser/media/router/presentation_service_delegate_impl.h |
diff --git a/chrome/browser/media/router/presentation_service_delegate_impl.h b/chrome/browser/media/router/presentation_service_delegate_impl.h |
index 17f04dbfc5a2241726b4afeaa8e194c74ce834de..50af235ac7770e4c614d02eba9ae58c7779b15d5 100644 |
--- a/chrome/browser/media/router/presentation_service_delegate_impl.h |
+++ b/chrome/browser/media/router/presentation_service_delegate_impl.h |
@@ -16,6 +16,7 @@ |
#include "base/observer_list.h" |
#include "chrome/browser/media/router/media_router.h" |
#include "chrome/browser/media/router/media_source.h" |
+#include "chrome/browser/media/router/render_frame_host_helper.h" |
#include "content/public/browser/presentation_service_delegate.h" |
#include "content/public/browser/web_contents_observer.h" |
#include "content/public/browser/web_contents_user_data.h" |
@@ -95,15 +96,24 @@ class PresentationServiceDelegateImpl |
int render_frame_id, |
const content::PresentationSessionInfo& session, |
const content::PresentationSessionMessageCallback& message_cb) override; |
- void SendMessage(int render_process_id, |
- int render_frame_id, |
- const content::PresentationSessionInfo& session, |
- scoped_ptr<content::PresentationSessionMessage> message, |
- const SendMessageCallback& send_message_cb) override; |
+ void SendMessage( |
+ int render_process_id, |
+ int render_frame_id, |
+ const content::PresentationSessionInfo& session, |
+ scoped_ptr<content::PresentationSessionMessage> message, |
+ const content::SendMessageCallback& send_message_cb) override; |
bool ListenForSessionStateChange( |
int render_process_id, |
int render_frame_id, |
content::PresentationSessionStateListener* listener) override; |
+ void NotifyWhenReceiverSessionIsAvailable( |
+ int render_process_id, |
+ int render_frame_id, |
+ const content::PresentationReceiverSessionAvailableCallback& callback) |
+ override; |
+ std::vector<content::PresentationSessionInfo> GetPresentationReceiverSessions( |
+ int render_process_id, |
+ int render_frame_id) override; |
// Callback invoked when there is a route response from CreateRoute/JoinRoute |
// outside of a Presentation API request. This could be due to |
@@ -175,7 +185,7 @@ class PresentationServiceDelegateImpl |
int render_frame_id, |
const PresentationSessionSuccessCallback& success_cb, |
const content::PresentationSessionInfo& new_session, |
- const MediaRoute::Id& route_id); |
+ const MediaRoute& route); |
// Returns |true| if the frame is the main frame of |web_contents_|. |
bool IsMainFrame(int render_process_id, int render_frame_id) const; |
@@ -201,7 +211,7 @@ class PresentationServiceDelegateImpl |
// References to the WebContents that owns this instance, and associated |
// browser profile's MediaRouter instance. |
- content::WebContents* web_contents_; |
+ content::WebContents* const web_contents_; |
MediaRouter* router_; |
scoped_ptr<PresentationFrameManager> frame_manager_; |