Use local ids for Surfaces APIs that can only apply to local surfaces

services/view_manager/display_manager.h

Index: services/view_manager/display_manager.h
diff --git a/services/view_manager/display_manager.h b/services/view_manager/display_manager.h
index 6a36ca2d3c4c8ec09dc5a5424588fad8ccef0fb7..482b0c1594aba5c3d57e5deeff3ea5b4245bab92 100644
--- a/services/view_manager/display_manager.h
+++ b/services/view_manager/display_manager.h
@@ -67,8 +67,6 @@ class DefaultDisplayManager : public DisplayManager,
 
  private:
   void OnCreatedNativeViewport(uint64_t native_viewport_id);
-  void OnSurfaceConnectionCreated(mojo::SurfacePtr surface,
-                                  uint32_t id_namespace);
   void Draw();
 
   // NativeViewportClient:
@@ -87,10 +85,9 @@ class DefaultDisplayManager : public DisplayManager,
   gfx::Rect dirty_rect_;
   base::Timer draw_timer_;
 
-  mojo::SurfacesServicePtr surfaces_service_;
   mojo::SurfacePtr surface_;
-  scoped_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
-  cc::SurfaceId surface_id_;
+  uint32_t id_namespace_;
+  uint32_t local_id_;

[sky, 2015/01/13 18:14:27]

Since local_id_ is only has two values, it seems like a boolean would be better.
Maybe did_create_surface_?

[jamesr, 2015/01/14 01:50:30]

Hmm, yeah that'd be better.  Added surface_allocated_ since it can transition
multiple times from true->false->true over time

   mojo::NativeViewportPtr native_viewport_;
   mojo::Callback<void()> native_viewport_closed_callback_;
   base::WeakPtrFactory<DefaultDisplayManager> weak_factory_;