Index: chrome/browser/media/router/offscreen_presentation_manager.h |
diff --git a/chrome/browser/media/router/offscreen_presentation_manager.h b/chrome/browser/media/router/offscreen_presentation_manager.h |
new file mode 100644 |
index 0000000000000000000000000000000000000000..8052bea4c585a6d435eba5184e18404dd3d7c735 |
--- /dev/null |
+++ b/chrome/browser/media/router/offscreen_presentation_manager.h |
@@ -0,0 +1,166 @@ |
+// Copyright 2016 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_OFFSCREEN_PRESENTATION_MANAGER_H_ |
+#define CHROME_BROWSER_MEDIA_ROUTER_OFFSCREEN_PRESENTATION_MANAGER_H_ |
+ |
+#include <map> |
+#include <memory> |
+#include <string> |
+ |
+#include "base/macros.h" |
+#include "chrome/browser/media/router/render_frame_host_id.h" |
+#include "components/keyed_service/core/keyed_service.h" |
+#include "content/public/browser/presentation_service_delegate.h" |
+ |
+namespace media_router { |
+ |
+// Instances of this class manages all offscreen presentations started in the |
+// associated Profile and facilitates communication between the controllers and |
+// the receiver of an offscreen presentation. |
+// |
+// Example usage: |
+// |
+// Receiver is created to host the offscreen presentation and registers itself |
+// so that controller frames can connect to it: |
+// |
+// OffscreenPresentationManager* manager = |
+// OffscreenPresentationManagerFactory::GetOrCreateForBrowserContext( |
+// context); |
mark a. foltz
2016/10/06 03:13:55
Is |context| the one that has the controller frame
zhaobin
2016/10/07 01:07:03
context is browserContext (profile).
offscreen_pr
|
+// manager->RegisterOffscreenPresentationReceiver(presentation_id, |
+// base::Bind(&OnReceiverConnectionAvailable)); |
+// ... |
+// void OnReceiverConnectionAvailable( |
mark a. foltz
2016/10/06 03:13:55
Is this called when a connection is available to t
zhaobin
2016/10/07 01:07:04
receiver PSImpl::onReceiverConnectionAvailable() i
|
+// const content::PresentationSessionInfo& session, |
+// OffscreenPresentationClient* controller) { |
+// [Connects controller PSImpl with receiver PSImpl to send/receive |
+// messages in response to send()] |
+// controller->SetOffscreenPresentationClient(receiver); |
+// receiver->SetOffscreenPresentationClient(controller); |
+// } |
+// |
+// Controller frame establishes connection with the receiver side, resulting |
+// in a session with the two endpoints being the controller frame's PSImpl |
+// (OffscreenPresentationClient) and the receiver frame's PSImpl |
+// (OffscreenPresentationClient). Note calling this will trigger |
+// |OnReceiverConnectionAvailable| on the receiver side. |
+// |
+// manager->RegisterOffscreenPresentationController( |
+// presentation_id, controller_frame_id, controller_ptr); |
+// |
+// To send message from controller to receiver: |
mark a. foltz
2016/10/06 03:13:54
It looks like this is the same for the other direc
zhaobin
2016/10/07 01:07:04
Done.
|
+// |
+// In controll's PSImpl::SendSessionMessage() { |
mark a. foltz
2016/10/06 03:13:55
contoller's
zhaobin
2016/10/07 01:07:04
Done.
|
+// receiver.OnSessionMessage(); |
+// } |
+// |
+// A controller or receiver leaves the offscreen presentation (e.g., |
+// due to navigation) by unregistering themselves from |
+// OffscreenPresentationConnection object. |
mark a. foltz
2016/10/06 03:13:54
If the receiver navigates, the offscreen tab shoul
zhaobin
2016/10/07 01:07:04
UnregisterReceiver() called in ReceiverPSDImpl::Re
|
+// |
+// When the receiver is no longer associated with an offscreen presentation, it |
mark a. foltz
2016/10/06 03:13:55
I believe there are five ways to terminate an offs
zhaobin
2016/10/07 01:07:04
(Not implemented yet)
for #4, it will close the c
|
+// shall remove itself from associated controllers and then unregister itself |
+// with OffscreenPresentationManager. Unregistration will prevent additional |
+// controllers from establishing a connection with the receiver: |
+// |
+// In receiver's PSImpl::Reset() { |
+// for (controller : offscreen_presentation_observers_) |
+// controller->RemoveOffscreenPresentationClient(receiver); |
+// } |
+// manager->UnregisterOffscreenPresentationReceiver(presentation_id); |
+// |
+// This class is not thread safe. All functions must be invoked on the UI |
mark a. foltz
2016/10/06 03:13:54
Is this called by another thread or code outside o
zhaobin
2016/10/07 01:07:04
Done.
|
+// thread. All callbacks passed into this class will also be invoked on UI |
+// thread. |
+class OffscreenPresentationManager : public KeyedService { |
+ public: |
+ ~OffscreenPresentationManager() override; |
+ |
+ // Register controller PSImpl to presentation with |presentation_id|, |
mark a. foltz
2016/10/06 03:13:55
Nit: Registers, Creates, Unregisters, etc. in func
zhaobin
2016/10/07 01:07:03
Done.
|
+ // |render_frame_id|. |
+ // Create a new presentation if no presentation with |presentation_id| exists. |
+ // |controller| Not owned by this class. |
+ void RegisterOffscreenPresentationController( |
+ const std::string& presentation_id, |
+ const std::string& presentation_url, |
mark a. foltz
2016/10/06 03:13:54
const GURL&
zhaobin
2016/10/07 01:07:03
Merge GURL changes after https://codereview.chromi
|
+ const RenderFrameHostId& render_frame_id, |
+ content::PresentationConnectionPtr controller); |
+ |
+ // Unregister controller PSImpl to presentation with |presentation_id|, |
+ // |render_frame_id|. |
+ void UnregisterOffscreenPresentationController( |
+ const std::string& presentation_id, |
+ const RenderFrameHostId& render_frame_id); |
mark a. foltz
2016/10/06 03:13:55
Should this take a content::PresentationConnection
zhaobin
2016/10/07 01:07:03
content::PresentationConnectionPtr disallows copy
|
+ |
+ // Register receiver PSImpl to presentation with |presentation_id|. |
mark a. foltz
2016/10/06 03:13:54
This function doesn't have a PSImpl parameter.
zhaobin
2016/10/07 01:07:03
Done.
|
+ void RegisterOffscreenPresentationReceiver( |
mark a. foltz
2016/10/06 03:13:55
OnOffscreenPresentationReceiverCreated(id, url, ca
zhaobin
2016/10/07 01:07:04
Done.
|
+ const std::string& presentation_id, |
+ const std::string& presentation_url, |
mark a. foltz
2016/10/06 03:13:54
const GURL&
zhaobin
2016/10/07 01:07:04
Done.
|
+ const content::ReceiverConnectionAvailableCallback& receiver_callback); |
+ |
+ void UnregisterOffscreenPresentationReceiver( |
mark a. foltz
2016/10/06 03:13:54
OnOffscreenPresentationReceiverTerminated(presenta
zhaobin
2016/10/07 01:07:03
Done.
zhaobin
2016/10/07 01:07:03
Done.
|
+ const std::string& presentation_id); |
+ |
+ private: |
+ // Represents an offscreen presentation registered with |
+ // OffscreenPresentationManager. |
+ // Contains callback to the receiver to inform it of new sessions |
mark a. foltz
2016/10/06 03:13:55
nit: s/sessions/connections/
zhaobin
2016/10/07 01:07:04
Done.
|
+ // established from a controller. |
+ // Contains set of controllers registered to OffscreenPresentationManager |
+ // before corresponding receiver. |
+ class OffscreenPresentation { |
+ public: |
+ explicit OffscreenPresentation(const std::string& presentation_id, |
+ const std::string& presentation_url); |
mark a. foltz
2016/10/06 03:13:55
const GURL&
zhaobin
2016/10/07 01:07:03
Done.
|
+ ~OffscreenPresentation(); |
+ |
+ void RegisterController(const RenderFrameHostId& render_frame_id, |
+ content::PresentationConnectionPtr controller); |
+ |
+ void UnregisterController(const RenderFrameHostId& render_frame_id); |
+ |
+ void RegisterReceiver( |
+ const content::ReceiverConnectionAvailableCallback& receiver_callback); |
+ |
+ private: |
+ friend class OffscreenPresentationManagerTest; |
+ friend class OffscreenPresentationManager; |
+ |
+ // presentation_id for current presentation |
mark a. foltz
2016/10/06 03:13:55
Nit: comments should end in period, here and below
zhaobin
2016/10/07 01:07:04
Done.
|
+ const std::string presentation_id_; |
+ |
+ // URL for current presentation |
+ const std::string presentation_url_; |
mark a. foltz
2016/10/06 03:13:55
const GURL
zhaobin
2016/10/07 01:07:04
Done.
|
+ |
+ // proxy to receiver PSImpl |
mark a. foltz
2016/10/06 03:13:54
I don't think this comment matches the code; the m
zhaobin
2016/10/07 01:07:04
Done.
|
+ content::ReceiverConnectionAvailableCallback receiver_callback_; |
+ |
+ // proxy to controller PSImpl |
+ // It only contains controllers registered before receiver_callback_ |
+ // is set. This map will be cleared in RegisterReceiver(). |
+ std::unordered_map<RenderFrameHostId, |
mark a. foltz
2016/10/06 03:13:55
Is it necessary to be a map, or would a vector<Pen
zhaobin
2016/10/07 01:07:04
It needs to be a map. We cannot pass content::Pres
|
+ content::PresentationConnectionPtr, |
+ RenderFrameHostIdHasher> |
+ pending_controllers_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(OffscreenPresentation); |
+ }; |
+ |
+ private: |
+ friend class OffscreenPresentationManagerFactory; |
+ friend class OffscreenPresentationManagerTest; |
+ |
+ // Used by OffscreenPresentationManagerFactory::GetOrCreateForBrowserContext. |
+ OffscreenPresentationManager(); |
+ |
+ // Maps from presentation ID to OffscreenPresentation. |
+ std::map<std::string, std::unique_ptr<OffscreenPresentation>> |
+ offscreen_presentations_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(OffscreenPresentationManager); |
+}; |
+ |
+} // namespace media_router |
+ |
+#endif // CHROME_BROWSER_MEDIA_ROUTER_OFFSCREEN_PRESENTATION_MANAGER_H_ |