[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 17f04dbfc5a2241726b4afeaa8e194c74ce834de..7e3153ab6b73b35e93c5739a517251b70086edce 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_id.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"
@@ -75,17 +76,18 @@ class PresentationServiceDelegateImpl
   void SetDefaultPresentationUrl(
       int render_process_id,
       int render_frame_id,
-      const std::string& default_presentation_url) override;
+      const std::string& default_presentation_url,
+      const PresentationSessionStartedCallback& callback) override;
   void StartSession(int render_process_id,
                     int render_frame_id,
                     const std::string& presentation_url,
-                    const PresentationSessionSuccessCallback& success_cb,
+                    const PresentationSessionStartedCallback& success_cb,
                     const PresentationSessionErrorCallback& error_cb) override;
   void JoinSession(int render_process_id,
                    int render_frame_id,
                    const std::string& presentation_url,
                    const std::string& presentation_id,
-                   const PresentationSessionSuccessCallback& success_cb,
+                   const PresentationSessionStartedCallback& success_cb,
                    const PresentationSessionErrorCallback& error_cb) override;
   void CloseSession(int render_process_id,
                     int render_frame_id,
@@ -95,15 +97,21 @@ 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;
 
   // Callback invoked when there is a route response from CreateRoute/JoinRoute
   // outside of a Presentation API request. This could be due to
@@ -164,7 +172,7 @@ class PresentationServiceDelegateImpl
   void OnJoinRouteResponse(int render_process_id,
                            int render_frame_id,
                            const content::PresentationSessionInfo& session,
-                           const PresentationSessionSuccessCallback& success_cb,
+                           const PresentationSessionStartedCallback& success_cb,
                            const PresentationSessionErrorCallback& error_cb,
                            const MediaRoute* route,
                            const std::string& presentation_id,
@@ -173,9 +181,9 @@ class PresentationServiceDelegateImpl
   void OnStartSessionSucceeded(
       int render_process_id,
       int render_frame_id,
-      const PresentationSessionSuccessCallback& success_cb,
+      const PresentationSessionStartedCallback& 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,10 +209,11 @@ 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_;

[miu, 2015/10/20 00:56:50]

This should not be a scoped_ptr<> type.  Avoid the extra indirection by just
using:

  PresentationFrameManager frame_manager_;

[imcheng, 2016/06/13 22:30:01]

PresentationFrameManager is defined in the .cc file in an anonymous namespace,
thus it is forward declared here and has to be the form of a pointer. Though I
will say this has made things harder to test so we should look into whether it's
worth it to move it into the header.

+  scoped_ptr<PresentationController> controller_;

[miu, 2015/10/20 00:56:50]

This new data member appears to be unused.

[imcheng, 2016/06/13 22:30:01]

Removed.

 
   base::WeakPtrFactory<PresentationServiceDelegateImpl> weak_factory_;