[Presentation API] 1-UA presentation support + presenter APIs.

chrome/browser/media/router/presentation_service_delegate_impl.h

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 aa80c64bbb62cd88530f508dd1648206eefac9e1..9cd5899147bcbc1959b4af7865207432451e0f86 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"
@@ -93,15 +94,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 GetPresentationReceiverSession(

[mark a. foltz, 2015/10/01 06:25:28]

Do we need both this and the GetSessions method below?
If so, please add some comments explaining the difference.

[imcheng, 2015/10/06 00:59:15]

I added comments in presentation_service_delegate.h interface.

+      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
@@ -173,7 +183,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;
@@ -195,7 +205,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_;