[Presentation API] Convert screen availability API into Client style.

content/renderer/presentation/presentation_dispatcher.cc

 // 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.
 
 #include "content/renderer/presentation/presentation_dispatcher.h"
 
 #include "base/logging.h"
 #include "content/common/presentation/presentation_service.mojom.h"
 #include "content/public/common/service_registry.h"
 #include "content/public/renderer/render_frame.h"
@@ skipping 41 matching lines @@
   GURL url(frame->GetWebFrame()->document().defaultPresentationURL());
   return url.is_valid() ? url : GURL();
 }
 
 }  // namespace
 
 namespace content {
 
 PresentationDispatcher::PresentationDispatcher(RenderFrame* render_frame)
     : RenderFrameObserver(render_frame),
-      controller_(nullptr) {
+      controller_(nullptr),
+      binding_(this) {
 }
 
 PresentationDispatcher::~PresentationDispatcher() {
   // Controller should be destroyed before the dispatcher when frame is
   // destroyed.
   DCHECK(!controller_);
 }
 
 void PresentationDispatcher::setController(
     blink::WebPresentationController* controller) {
   // There shouldn't be any swapping from one non-null controller to another.
   DCHECK(controller != controller_ && (!controller || !controller_));
   controller_ = controller;
   // The controller is set to null when the frame is about to be detached.
   // Nothing is listening for screen availability anymore but the Mojo service
   // will know about the frame being detached anyway.
 }
 
 void PresentationDispatcher::updateAvailableChangeWatched(bool watched) {
-  GURL presentation_url(GetPresentationURLFromFrame(render_frame()));
-  DoUpdateAvailableChangeWatched(presentation_url.spec(), watched);
-}
-
-void PresentationDispatcher::DoUpdateAvailableChangeWatched(
-    const std::string& presentation_url, bool watched) {
   ConnectToPresentationServiceIfNeeded();
   if (watched) {
-    presentation_service_->ListenForScreenAvailability(
-        presentation_url,
-        base::Bind(&PresentationDispatcher::OnScreenAvailabilityChanged,
-                 base::Unretained(this)));
+    presentation_service_->ListenForScreenAvailability();
   } else {

[whywhat, 2015/05/11 17:58:19]

nit: don't need the {}

[imcheng (use chromium acct), 2015/05/11 22:04:12]

Done.

-    presentation_service_->RemoveScreenAvailabilityListener(presentation_url);
+    presentation_service_->StopListeningForScreenAvailability();
   }
 }
 
 void PresentationDispatcher::startSession(
     const blink::WebString& presentationUrl,
     const blink::WebString& presentationId,
     blink::WebPresentationSessionClientCallbacks* callback) {
   DCHECK(callback);
   ConnectToPresentationServiceIfNeeded();
 
@@ skipping 37 matching lines @@
 }
 
 void PresentationDispatcher::DidChangeDefaultPresentation() {
   GURL presentation_url(GetPresentationURLFromFrame(render_frame()));
 
   ConnectToPresentationServiceIfNeeded();
   presentation_service_->SetDefaultPresentationURL(
       presentation_url.spec(), mojo::String());
 }
 
-void PresentationDispatcher::OnScreenAvailabilityChanged(
-    const std::string& presentation_url, bool available) {
-  if (!controller_)
-    return;
-
-  // Reset the callback to get the next event.
-  DoUpdateAvailableChangeWatched(presentation_url,
-                                 controller_->isAvailableChangeWatched());
-
-  controller_->didChangeAvailability(available);
+void PresentationDispatcher::OnScreenAvailabilityUpdated(bool available) {
+  if (controller_)
+    controller_->didChangeAvailability(available);
 }
 
 void PresentationDispatcher::OnDefaultSessionStarted(
     presentation::PresentationSessionInfoPtr session_info) {
   if (!controller_)
     return;
 
   // Reset the callback to get the next event.
   presentation_service_->ListenForDefaultSessionStart(base::Bind(
       &PresentationDispatcher::OnDefaultSessionStarted,
@@ skipping 60 matching lines @@
       base::Bind(&PresentationDispatcher::OnSessionMessagesReceived,
                  base::Unretained(this)));
 }
 
 void PresentationDispatcher::ConnectToPresentationServiceIfNeeded() {
   if (presentation_service_.get())
     return;
 
   render_frame()->GetServiceRegistry()->ConnectToRemoteService(
       &presentation_service_);
+  presentation::PresentationServiceClientPtr client_ptr;
+  binding_.Bind(GetProxy(&client_ptr));
+  presentation_service_->SetClient(client_ptr.Pass());
+
   // TODO(imcheng): Uncomment these once they are implemented on the browser
   // side. (crbug.com/459006)
   /*
   presentation_service_->ListenForDefaultSessionStart(base::Bind(
       &PresentationDispatcher::OnDefaultSessionStarted,
       base::Unretained(this)));
   presentation_service_->ListenForSessionStateChange(base::Bind(
       &PresentationDispatcher::OnSessionStateChange,
       base::Unretained(this)));
   presentation_service_->ListenForSessionMessages(
       base::Bind(&PresentationDispatcher::OnSessionMessagesReceived,
       base::Unretained(this)));
   */
 }
 
 }  // namespace content