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

content/browser/presentation/presentation_service_impl.h

Index: content/browser/presentation/presentation_service_impl.h
diff --git a/content/browser/presentation/presentation_service_impl.h b/content/browser/presentation/presentation_service_impl.h
index 05b452fd88862e8452962515f63f029f4815652c..d0bbe0145f30632b7f2f95fc79b0a5354c23b6f6 100644
--- a/content/browser/presentation/presentation_service_impl.h
+++ b/content/browser/presentation/presentation_service_impl.h
@@ -98,7 +98,7 @@ class CONTENT_EXPORT PresentationServiceImpl
   // Maximum number of pending JoinSession requests at any given time.
   static const int kMaxNumQueuedSessionRequests = 10;
 
-  using DefaultSessionMojoCallback =
+  using PresentationSessionMojoCallback =

[whywhat, 2015/10/07 13:25:53]

nit: Could this rename be done separately maybe? It seems to affect some files
exclusively so distracts from the main change?

[imcheng, 2015/10/17 01:00:22]

I am changing this in a separate CL I am currently working on. See top level
comment.

       mojo::Callback<void(presentation::PresentationSessionInfoPtr)>;
   using SessionStateCallback =
       mojo::Callback<void(presentation::PresentationSessionInfoPtr,
@@ -151,7 +151,7 @@ class CONTENT_EXPORT PresentationServiceImpl
 
     // Adds a callback. May invoke the callback immediately if |session| using
     // default presentation URL was already started.
-    void AddCallback(const DefaultSessionMojoCallback& callback);
+    void AddCallback(const PresentationSessionMojoCallback& callback);
 
     // Sets the session info. Maybe invoke callbacks queued with AddCallback().
     void set_session(const PresentationSessionInfo& session);
@@ -161,7 +161,7 @@ class CONTENT_EXPORT PresentationServiceImpl
     // PresentationSessionInfoPtr.
     void Reset();
 
-    ScopedVector<DefaultSessionMojoCallback> callbacks_;
+    ScopedVector<PresentationSessionMojoCallback> callbacks_;
     scoped_ptr<PresentationSessionInfo> session_;
   };
 
@@ -197,7 +197,7 @@ class CONTENT_EXPORT PresentationServiceImpl
   void ListenForScreenAvailability(const mojo::String& url) override;
   void StopListeningForScreenAvailability(const mojo::String& url) override;
   void ListenForDefaultSessionStart(
-      const DefaultSessionMojoCallback& callback) override;
+      const PresentationSessionMojoCallback& callback) override;
   void StartSession(
       const mojo::String& presentation_url,
       const NewSessionMojoCallback& callback) override;
@@ -215,6 +215,8 @@ class CONTENT_EXPORT PresentationServiceImpl
       presentation::PresentationSessionInfoPtr session) override;
   void ListenForSessionMessages(
       presentation::PresentationSessionInfoPtr session) override;
+  void GetPresentationReceiverSession(
+      const PresentationSessionMojoCallback& callback) override;
 
   // Creates a binding between this object and |request|.
   void Bind(mojo::InterfaceRequest<presentation::PresentationService> request);
@@ -260,6 +262,8 @@ class CONTENT_EXPORT PresentationServiceImpl
       int request_session_id,
       const PresentationError& error);
   void OnSendMessageCallback(bool sent);
+  void OnGetPresentationReceiverSession(
+      const content::PresentationSessionInfo* session_info);
 
   // Passed to embedder's implementation of PresentationServiceDelegate for
   // later invocation when session messages arrive.
@@ -316,6 +320,8 @@ class CONTENT_EXPORT PresentationServiceImpl
 
   scoped_ptr<SessionMessagesCallback> on_session_messages_callback_;
 
+  PresentationSessionMojoCallback receiver_session_callback_;
+
   // ID of the RenderFrameHost this object is associated with.
   int render_process_id_;
   int render_frame_id_;