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

chrome/browser/media/router/presentation_service_delegate_impl.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_MEDIA_ROUTER_PRESENTATION_SERVICE_DELEGATE_IMPL_H_
 #define CHROME_BROWSER_MEDIA_ROUTER_PRESENTATION_SERVICE_DELEGATE_IMPL_H_
 
 #include <map>
 #include <string>
 #include <utility>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #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"
 
 namespace content {
 class RenderFrameHost;
 class PresentationScreenAvailabilityListener;
 class WebContents;
 struct PresentationSessionInfo;
 struct PresentationSessionMessage;
@@ skipping 39 matching lines @@
       int render_frame_id,
       content::PresentationScreenAvailabilityListener* listener) override;
   void RemoveScreenAvailabilityListener(
       int render_process_id,
       int render_frame_id,
       content::PresentationScreenAvailabilityListener* listener) override;
   void Reset(int render_process_id, int render_frame_id) override;
   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,
                     const std::string& presentation_id) override;
   void ListenForSessionMessages(
       int render_process_id,
       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
   // browser action (e.g., browser initiated media router dialog) or
   // a media route provider (e.g., autojoin).
   void OnRouteResponse(const MediaRoute* route,
                        const std::string& presentation_id,
                        const std::string& error);
 
   // Returns the default MediaSource for this tab if there is one.
@@ skipping 40 matching lines @@
   explicit PresentationServiceDelegateImpl(content::WebContents* web_contents);
 
   // Returns |listener|'s presentation URL as a MediaSource. If |listener| does
   // not have a persentation URL, returns the tab mirroring MediaSource.
   MediaSource GetMediaSourceFromListener(
       content::PresentationScreenAvailabilityListener* listener);
 
   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,
                            const std::string& error_text);
 
   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;
 
   // Updates tab-level default MediaSource, default frame URL, and the
   // originating frame. If the source or frame URL changed, notify the
   // observers.
   void UpdateDefaultMediaSourceAndNotifyObservers(
       const RenderFrameHostId& render_frame_host_id,
       const MediaSource& new_default_source,
       const GURL& new_default_frame_url);
 
   // ID of RenderFrameHost that contains the default presentation.
   RenderFrameHostId default_presentation_render_frame_host_id_;
   // Default MediaSource for the tab associated with this instance.
   MediaSource default_source_;
   // URL of the frame that contains the default MediaSource.
   GURL default_frame_url_;
 
   // References to the observers listening for changes to default media source.
   base::ObserverList<
       DefaultMediaSourceObserver> default_media_source_observers_;
 
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(PresentationServiceDelegateImpl);
 };
 
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_PRESENTATION_SERVICE_DELEGATE_IMPL_H_