Convert view manager to surfaces with uploading shim in client lib

mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.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 MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
 #define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "mojo/services/public/cpp/view_manager/types.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/cpp/view_manager/view_manager.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 #include "mojo/services/public/interfaces/window_manager/window_manager.mojom.h"
 
 class SkBitmap;
 
 namespace mojo {
 class ApplicationConnection;
+class BitmapUploader;
 class ViewManager;
 class ViewManagerDelegate;
 class ViewManagerTransaction;
 
 // Manages the connection with the View Manager service.
 class ViewManagerClientImpl : public ViewManager,
                               public InterfaceImpl<ViewManagerClient>,
                               public WindowManagerClient {
  public:
   ViewManagerClientImpl(ViewManagerDelegate* delegate,
@@ skipping 13 matching lines @@
   // refers to the root view.
   void AddChild(Id child_id, Id parent_id);
   void RemoveChild(Id child_id, Id parent_id);
 
   void Reorder(Id view_id, Id relative_view_id, OrderDirection direction);
 
   // Returns true if the specified view was created by this connection.
   bool OwnsView(Id id) const;
 
   void SetBounds(Id view_id, const gfx::Rect& bounds);
+  void SetSurfaceId(Id view_id, SurfaceIdPtr surface_id);
+  // TODO(jamesr): Remove once all callers switch from SetContents to
+  // SetSurfaceId.
   void SetViewContents(Id view_id, const SkBitmap& contents);
   void SetFocus(Id view_id);
   void SetVisible(Id view_id, bool visible);
 
   void Embed(const String& url, Id view_id);
   void Embed(const String& url,
              Id view_id,
              ServiceProviderPtr service_provider);
 
   void set_change_acked_callback(const base::Callback<void(void)>& callback) {
@@ skipping 77 matching lines @@
   WindowManagerDelegate* window_manager_delegate_;
 
   std::vector<View*> roots_;
 
   IdToViewMap views_;
 
   ViewManagerService* service_;
 
   WindowManagerServicePtr window_manager_;
 
+  // TODO(jamesr): Remove once all callers switch from SetContents to
+  // SetSurfaceId.
+  ApplicationConnection* app_connection_;
+  scoped_ptr<BitmapUploader> bitmap_uploader_;
+
   DISALLOW_COPY_AND_ASSIGN(ViewManagerClientImpl);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_LIB_VIEW_MANAGER_CLIENT_IMPL_H_