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

content/renderer/presentation/presentation_dispatcher.h

Index: content/renderer/presentation/presentation_dispatcher.h
diff --git a/content/renderer/presentation/presentation_dispatcher.h b/content/renderer/presentation/presentation_dispatcher.h
index c88786357c747663c30d61b430e55fa311084f94..b0b35dfd5913e98bfc64814350971e6f7f69fba9 100644
--- a/content/renderer/presentation/presentation_dispatcher.h
+++ b/content/renderer/presentation/presentation_dispatcher.h
@@ -21,12 +21,12 @@ namespace content {
 // 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);
@@ -43,12 +43,13 @@ class CONTENT_EXPORT PresentationDispatcher
       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,
@@ -63,13 +64,10 @@ class CONTENT_EXPORT PresentationDispatcher
 
   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