Chromium Code Reviews| 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 8b89af126f8b754d20ad365bc41001c80622d411..74278baf7b7ebde425fa166c75c73f7523f4ae2f 100644 |
| --- a/chrome/browser/media/router/presentation_service_delegate_impl.h |
| +++ b/chrome/browser/media/router/presentation_service_delegate_impl.h |
| @@ -35,6 +35,7 @@ namespace media_router { |
| class MediaRoute; |
| class MediaSinksObserver; |
| +class OffscreenPresentationManager; |
| class PresentationFrameManager; |
| class RouteRequestResult; |
| @@ -46,7 +47,7 @@ class RouteRequestResult; |
| // and is managed by the associated WebContents. |
| class PresentationServiceDelegateImpl |
| : public content::WebContentsUserData<PresentationServiceDelegateImpl>, |
| - public content::PresentationServiceDelegate { |
| + public content::ControllerPresentationServiceDelegate { |
| public: |
| // Observer interface for listening to default presentation request |
| // changes for the WebContents. |
| @@ -77,7 +78,7 @@ class PresentationServiceDelegateImpl |
| void AddObserver( |
| 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 +129,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. |
| @@ -193,7 +199,7 @@ class PresentationServiceDelegateImpl |
| int render_frame_id, |
| const content::PresentationSessionStartedCallback& success_cb, |
| const content::PresentationSessionInfo& new_session, |
| - const MediaRoute::Id& route_id); |
| + const MediaRoute& route); |
| // References to the WebContents that owns this instance, and associated |
| // browser profile's MediaRouter instance. |
| @@ -202,6 +208,8 @@ class PresentationServiceDelegateImpl |
| std::unique_ptr<PresentationFrameManager> frame_manager_; |
| + OffscreenPresentationManager* offscreen_presentation_manager_; |
|
imcheng
2016/11/01 17:20:29
* const, but see comment in .cc file.
zhaobin
2016/11/02 03:55:47
Done.
|
| + |
| base::WeakPtrFactory<PresentationServiceDelegateImpl> weak_factory_; |
| DISALLOW_COPY_AND_ASSIGN(PresentationServiceDelegateImpl); |