De-Client Surface interface

services/view_manager/display_manager.h

 // Copyright 2014 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 SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_
 #define SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 32 matching lines @@
                              const gfx::Rect& bounds) = 0;
 
   virtual void SetViewportSize(const gfx::Size& size) = 0;
 
   virtual const mojo::ViewportMetrics& GetViewportMetrics() = 0;
 };
 
 // DisplayManager implementation that connects to the services necessary to
 // actually display.
 class DefaultDisplayManager : public DisplayManager,
-                              public mojo::SurfaceClient,
                               public mojo::ErrorHandler {
  public:
   DefaultDisplayManager(
       mojo::ApplicationConnection* app_connection,
       const mojo::Callback<void()>& native_viewport_closed_callback);
   ~DefaultDisplayManager() override;
 
   // DisplayManager:
   void Init(ConnectionManager* connection_manager) override;
   void SchedulePaint(const ServerView* view, const gfx::Rect& bounds) override;
   void SetViewportSize(const gfx::Size& size) override;
   const mojo::ViewportMetrics& GetViewportMetrics() override;
 
  private:
   void OnCreatedNativeViewport(uint64_t native_viewport_id,
                                mojo::ViewportMetricsPtr metrics);
   void Draw();
 
   void OnMetricsChanged(mojo::ViewportMetricsPtr metrics);
 
-  // SurfaceClient:
-  void SetIdNamespace(uint32_t id_namespace) override;
-  void ReturnResources(
-      mojo::Array<mojo::ReturnedResourcePtr> resources) override;
+  void SetIdNamespace(uint32_t id_namespace);
 
   // ErrorHandler:
   void OnConnectionError() override;
 
   mojo::ApplicationConnection* app_connection_;
   ConnectionManager* connection_manager_;
 
   mojo::ViewportMetrics metrics_;
   gfx::Rect dirty_rect_;
   base::Timer draw_timer_;
 
   mojo::SurfacePtr surface_;
   uint32_t id_namespace_;
   bool surface_allocated_;
   mojo::NativeViewportPtr native_viewport_;
   mojo::Callback<void()> native_viewport_closed_callback_;
   base::WeakPtrFactory<DefaultDisplayManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager);
 };
 
 }  // namespace view_manager
 
 #endif  // SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_