Convert view manager to surfaces with uploading shim in client lib

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 ServiceProviderImpl;
 class View;
@@ skipping 37 matching lines @@
   void RemoveChild(View* child);
 
   void Reorder(View* relative, OrderDirection direction);
   void MoveToFront();
   void MoveToBack();
 
   bool Contains(View* child) const;
 
   View* GetChildById(Id id);
 
+  void SetSurfaceId(SurfaceIdPtr id);
+
   // TODO(beng): temporary only.
   void SetContents(const SkBitmap& contents);
   void SetColor(SkColor color);
 
   // Focus.
   void SetFocus();
 
   // Embedding.
   void Embed(const String& url);
   scoped_ptr<ServiceProvider> Embed(
@@ skipping 26 matching lines @@
   ObserverList<ViewObserver> observers_;
 
   gfx::Rect bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(View);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_H_