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

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 6981b117a28316d19ef20311f4bdc9a3b9cdf648..72050c95cfb80550516589127f4f1a7e6bb6be2d 100644
--- a/chrome/browser/media/router/presentation_service_delegate_impl.h
+++ b/chrome/browser/media/router/presentation_service_delegate_impl.h
@@ -18,6 +18,7 @@
 #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"
@@ -35,6 +36,7 @@ namespace media_router {
 
 class MediaRoute;
 class MediaSinksObserver;
+class OffscreenPresentationManager;
 class PresentationFrameManager;
 class RouteRequestResult;
 
@@ -46,7 +48,8 @@ class RouteRequestResult;
 // 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.
@@ -77,7 +80,7 @@ class PresentationServiceDelegateImpl
   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,
@@ -128,6 +131,11 @@ class PresentationServiceDelegateImpl
       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.