[Presentation API] Additional plumbing for PresentationServiceImpl.

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 38 matching lines @@
     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) {
+  DoUpdateAvailableChangeWatched(std::string(), watched);

[whywhat, 2015/03/13 17:44:35]

note: string() should be replaced with GetPresentationURLFromFrame() once you
merge my CL

[imcheng, 2015/03/13 23:36:46]

Acknowledged.

+}
+
+void PresentationDispatcher::DoUpdateAvailableChangeWatched(
+    const std::string& presentation_url, bool watched) {
   ConnectToPresentationServiceIfNeeded();
   if (watched) {
     presentation_service_->GetScreenAvailability(
-        mojo::String(),
+        presentation_url,
         base::Bind(&PresentationDispatcher::OnScreenAvailabilityChanged,
                  base::Unretained(this)));
   } else {
-    presentation_service_->OnScreenAvailabilityListenerRemoved();
+    presentation_service_->OnScreenAvailabilityListenerRemoved(
+        presentation_url);
   }
 }
 
 void PresentationDispatcher::startSession(
     const blink::WebString& presentationUrl,
     const blink::WebString& presentationId,
     blink::WebPresentationSessionClientCallbacks* callback) {
   DCHECK(callback);
   ConnectToPresentationServiceIfNeeded();
 
@@ skipping 19 matching lines @@
   // OnSessionCreated() is called. |callback| needs to be alive and also needs
   // to be destroyed so we transfer its ownership to the mojo callback.
   presentation_service_->JoinSession(
       presentationUrl.utf8(),
       presentationId.utf8(),
       base::Bind(&PresentationDispatcher::OnSessionCreated,
           base::Unretained(this),
           base::Owned(callback)));
 }
 
-void PresentationDispatcher::OnScreenAvailabilityChanged(bool available) {
+void PresentationDispatcher::OnScreenAvailabilityChanged(
+    const std::string& presentation_url, bool available) {
   if (!controller_)
     return;
 
   // Reset the callback to get the next event.
-  updateAvailableChangeWatched(controller_->isAvailableChangeWatched());
+  DoUpdateAvailableChangeWatched(presentation_url,
+                                 controller_->isAvailableChangeWatched());
 
   controller_->didChangeAvailability(available);
 }
 
 void PresentationDispatcher::OnSessionCreated(
     blink::WebPresentationSessionClientCallbacks* callback,
     presentation::PresentationSessionInfoPtr session_info,
     presentation::PresentationErrorPtr error) {
   DCHECK(callback);
   if (!error.is_null()) {
     DCHECK(session_info.is_null());
     callback->onError(new blink::WebPresentationError(
-        GetWebPresentationErrorTypeFromMojo(error->errorType),
+        GetWebPresentationErrorTypeFromMojo(error->error_type),
         blink::WebString::fromUTF8(error->message)));
     return;
   }
 
   DCHECK(!session_info.is_null());
   PresentationSessionDispatcher* session_dispatcher =
       new PresentationSessionDispatcher(session_info.Pass());
   presentation_session_dispatchers_.push_back(session_dispatcher);
   callback->onSuccess(new PresentationSessionClient(session_dispatcher));
 }
 
 void PresentationDispatcher::ConnectToPresentationServiceIfNeeded() {
   if (presentation_service_.get())
     return;
 
   render_frame()->GetServiceRegistry()->ConnectToRemoteService(
       &presentation_service_);
 }
 
 }  // namespace content