Convert view manager to surfaces with uploading shim in client lib

mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h

Index: mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h
diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h
index 8135eca059aab7245a9ae568baf5eb7f0fdb1f51..556e1013e2d91dbddbb0bda4420e802ded91b522 100644
--- a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h
+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h
@@ -19,6 +19,7 @@
 class SkBitmap;
 
 namespace mojo {
+class BitmapUploader;
 class ViewManager;
 class ViewManagerDelegate;
 class ViewManagerTransaction;
@@ -52,6 +53,9 @@ class ViewManagerClientImpl : public ViewManager,
   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);
@@ -151,6 +155,11 @@ class ViewManagerClientImpl : public ViewManager,
 
   WindowManagerServicePtr window_manager_;
 
+  // TODO(jamesr): Remove once all callers switch from SetContents to
+  // SetSurfaceId.
+  Shell* shell_;
+  scoped_ptr<BitmapUploader> bitmap_uploader_;
+
   DISALLOW_COPY_AND_ASSIGN(ViewManagerClientImpl);
 };