Fixes for surfaces bindings exposed by wm_flow app

mojo/services/public/cpp/view_manager/view.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_VIEW_H_
 #define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/services/public/cpp/view_manager/types.h"
 #include "mojo/services/public/interfaces/surfaces/surface_id.mojom.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager_constants.mojom.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/geometry/rect.h"
 
 class SkBitmap;
 
 namespace mojo {
 
+class BitmapUploader;
 class ServiceProviderImpl;
 class View;
 class ViewManager;
 class ViewObserver;
 
 // Views are owned by the ViewManager.
 // TODO(beng): Right now, you'll have to implement a ViewObserver to track
 //             destruction and NULL any pointers you have.
 //             Investigate some kind of smart pointer or weak pointer for these.
 class View {
@@ skipping 63 matching lines @@
   friend class ViewManagerClientImpl;
 
   explicit View(ViewManager* manager);
 
   void LocalDestroy();
   void LocalAddChild(View* child);
   void LocalRemoveChild(View* child);
   // Returns true if the order actually changed.
   bool LocalReorder(View* relative, OrderDirection direction);
   void LocalSetBounds(const gfx::Rect& old_bounds, const gfx::Rect& new_bounds);
+  void CreateBitmapUploader();
 
   ViewManager* manager_;
   Id id_;
   View* parent_;
   Children children_;
 
   ObserverList<ViewObserver> observers_;
 
   gfx::Rect bounds_;
+  // TODO(jamesr): Temporary, remove when all clients are using surfaces
+  // directly.
+  scoped_ptr<BitmapUploader> bitmap_uploader_;
 
   DISALLOW_COPY_AND_ASSIGN(View);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_H_