Fixes for surfaces bindings exposed by wm_flow app

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 556e1013e2d91dbddbb0bda4420e802ded91b522..27ee53211e016b628e312f846e966f91fe6e9df4 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
@@ -57,6 +57,7 @@ class ViewManagerClientImpl : public ViewManager,
   // TODO(jamesr): Remove once all callers switch from SetContents to
   // SetSurfaceId.
   void SetViewContents(Id view_id, const SkBitmap& contents);
+  void SetViewColor(Id view_id, SkColor color);
   void SetFocus(Id view_id);
   void SetVisible(Id view_id, bool visible);
 
@@ -133,6 +134,8 @@ class ViewManagerClientImpl : public ViewManager,
   void OnActionCompleted(bool success);
   void OnActionCompletedWithErrorCode(ErrorCode code);
 
+  BitmapUploader* BitmapUploaderForView(Id view_id);
+
   base::Callback<void(bool)> ActionCompletedCallback();
   base::Callback<void(ErrorCode)> ActionCompletedCallbackWithErrorCode();
 
@@ -158,7 +161,8 @@ class ViewManagerClientImpl : public ViewManager,
   // TODO(jamesr): Remove once all callers switch from SetContents to
   // SetSurfaceId.
   Shell* shell_;
-  scoped_ptr<BitmapUploader> bitmap_uploader_;
+  typedef std::map<Id, BitmapUploader*> BitmapUploaderMap;
+  BitmapUploaderMap bitmap_uploaders_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerClientImpl);
 };