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

content/renderer/presentation/presentation_dispatcher.h

 // 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.
 
 #ifndef CONTENT_RENDERER_PRESENTATION_PRESENTATION_DISPATCHER_H_
 #define CONTENT_RENDERER_PRESENTATION_PRESENTATION_DISPATCHER_H_
 
 #include "base/compiler_specific.h"
 #include "content/common/content_export.h"
 #include "content/common/presentation/presentation_service.mojom.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "third_party/WebKit/public/platform/modules/presentation/WebPresentationClient.h"
 
 namespace blink {
 class WebString;
 }  // namespace blink
 
 namespace content {
 
 // PresentationDispatcher is a delegate for Presentation API messages used by
 // Blink. It forwards the calls to the Mojo PresentationService.
 class CONTENT_EXPORT PresentationDispatcher
     : public RenderFrameObserver,
-      public NON_EXPORTED_BASE(blink::WebPresentationClient) {
+      public NON_EXPORTED_BASE(blink::WebPresentationClient),
+      public NON_EXPORTED_BASE(presentation::PresentationServiceClient) {
  public:
   explicit PresentationDispatcher(RenderFrame* render_frame);
   ~PresentationDispatcher() override;
 
- private:
   // WebPresentationClient implementation.
   virtual void setController(
       blink::WebPresentationController* controller);
   virtual void updateAvailableChangeWatched(bool watched);
   virtual void startSession(
       const blink::WebString& presentationUrl,
       const blink::WebString& presentationId,
       blink::WebPresentationSessionClientCallbacks* callback);
   virtual void joinSession(
       const blink::WebString& presentationUrl,
       const blink::WebString& presentationId,
       blink::WebPresentationSessionClientCallbacks* callback);
   virtual void closeSession(
       const blink::WebString& presentationUrl,
       const blink::WebString& presentationId);
 
+ private:

[mark a. foltz, 2015/05/09 07:01:32]

Why does the WebPresentationClient implementation now need to be public?

[imcheng (use chromium acct), 2015/05/11 22:01:54]

Reverted placement of private: label. My bad.

   // RenderFrameObserver
   void DidChangeDefaultPresentation() override;
 
-  void OnScreenAvailabilityChanged(
-      const std::string& presentation_url,
-      bool available);
+  // presentation::PresentationServiceClient
+  void OnScreenAvailabilityUpdated(bool available) override;
+
   void OnSessionCreated(
       blink::WebPresentationSessionClientCallbacks* callback,
       presentation::PresentationSessionInfoPtr session_info,
       presentation::PresentationErrorPtr error);
   void OnDefaultSessionStarted(
       presentation::PresentationSessionInfoPtr session_info);
   void OnSessionStateChange(
       presentation::PresentationSessionInfoPtr session_info,
       presentation::PresentationSessionState session_state);
   void OnSessionMessagesReceived(
       mojo::Array<presentation::SessionMessagePtr> messages);
 
   void ConnectToPresentationServiceIfNeeded();
 
-  void DoUpdateAvailableChangeWatched(
-      const std::string& presentation_url,
-      bool watched);
-
   // Used as a weak reference. Can be null since lifetime is bound to the frame.
   blink::WebPresentationController* controller_;
   presentation::PresentationServicePtr presentation_service_;
+  mojo::Binding<presentation::PresentationServiceClient> binding_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PRESENTATION_PRESENTATION_DISPATCHER_H_