[Presentation API] (3rd) (1-UA) Split PresentationServiceDelegateImpl(PSDImpl)

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 <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.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/presentation_request.h"
+#include "chrome/browser/media/router/presentation_service_delegate_base_impl.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;
 }  // namespace content
 
 namespace media_router {
 
 class MediaRoute;
 class MediaSinksObserver;
+class OffscreenPresentationManager;
 class PresentationFrameManager;
 class RouteRequestResult;
 
 // Implementation of PresentationServiceDelegate that interfaces an instance of
 // WebContents with the Chrome Media Router. It uses the Media Router to handle
 // presentation API calls forwarded from PresentationServiceImpl. In addition,
 // it also provides default presentation URL that is required for creating
 // browser-initiated sessions.  It is scoped to the lifetime of a WebContents,
 // and is managed by the associated WebContents.
 class PresentationServiceDelegateImpl
     : public content::WebContentsUserData<PresentationServiceDelegateImpl>,
-      public content::PresentationServiceDelegate {
+      public content::ControllerPresentationServiceDelegate,
+      public PresentationServiceDelegateBaseImpl {
  public:
   // Observer interface for listening to default presentation request
   // changes for the WebContents.
   class DefaultPresentationRequestObserver {
    public:
     virtual ~DefaultPresentationRequestObserver() = default;
 
     // Called when default presentation request for the corresponding
     // WebContents is set or changed.
     // |default_presentation_info|: New default presentation request.
     virtual void OnDefaultPresentationChanged(
         const PresentationRequest& default_presentation_request) = 0;
 
     // Called when default presentation request for the corresponding
     // WebContents has been removed.
     virtual void OnDefaultPresentationRemoved() = 0;
   };
 
   // Retrieves the instance of PresentationServiceDelegateImpl that was attached
   // to the specified WebContents.  If no instance was attached, creates one,
   // and attaches it to the specified WebContents.
   static PresentationServiceDelegateImpl* GetOrCreateForWebContents(
       content::WebContents* web_contents);
 
   ~PresentationServiceDelegateImpl() override;
 
   // content::PresentationServiceDelegate implementation.
   void AddObserver(

[mark a. foltz, 2016/11/15 23:41:46]

You don't need to declare Add/RemoveObserver here since you just need the
implementations inherited from the base class.

[zhaobin, 2016/11/16 18:02:41]

Done.

       int render_process_id,
       int render_frame_id,
-      content::PresentationServiceDelegate::Observer* observer) override;
+      content::PresentationServiceDelegateBase::Observer* observer) override;
   void RemoveObserver(int render_process_id, int render_frame_id) override;
   bool AddScreenAvailabilityListener(
       int render_process_id,
       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;
@@ skipping 30 matching lines @@
                    int render_frame_id,
                    const content::PresentationSessionInfo& session,
                    std::unique_ptr<content::PresentationSessionMessage> message,
                    const SendMessageCallback& send_message_cb) override;
   void ListenForConnectionStateChange(
       int render_process_id,
       int render_frame_id,
       const content::PresentationSessionInfo& connection,
       const content::PresentationConnectionStateChangedCallback&
           state_changed_cb) override;
+  void ConnectToOffscreenPresentation(
+      int render_process_id,
+      int render_frame_id,
+      const content::PresentationSessionInfo& session,
+      content::PresentationConnectionPtr connection) override;
 
   // Callback invoked when a default PresentationRequest is started from a
   // browser-initiated dialog.
   void OnRouteResponse(const PresentationRequest& request,
                        const RouteRequestResult& result);
 
   // Adds / removes an observer for listening to default PresentationRequest
   // changes. This class does not own |observer|. When |observer| is about to
   // be destroyed, |RemoveDefaultPresentationRequestObserver| must be called.
   void AddDefaultPresentationRequestObserver(
@@ skipping 63 matching lines @@
   std::unique_ptr<PresentationFrameManager> frame_manager_;
 
   base::WeakPtrFactory<PresentationServiceDelegateImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PresentationServiceDelegateImpl);
 };
 
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_PRESENTATION_SERVICE_DELEGATE_IMPL_H_