Split surface id and simplify connecting to surfaces service

services/view_manager/display_manager.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 SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_
 #define SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 54 matching lines @@
   void OnCreatedNativeViewport(uint64_t native_viewport_id);
   void OnSurfaceConnectionCreated(mojo::SurfacePtr surface,
                                   uint32_t id_namespace);
   void Draw();
 
   // NativeViewportClient:
   void OnDestroyed() override;
   void OnSizeChanged(mojo::SizePtr size) override;
 
   // SurfaceClient:
+  void SetIdNamespace(uint32_t id_namespace) override;
   void ReturnResources(
       mojo::Array<mojo::ReturnedResourcePtr> resources) override;
 
   mojo::ApplicationConnection* app_connection_;
   ConnectionManager* connection_manager_;
 
   gfx::Size size_;
   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_;
   mojo::NativeViewportPtr native_viewport_;
   mojo::Callback<void()> native_viewport_closed_callback_;
   base::WeakPtrFactory<DefaultDisplayManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultDisplayManager);
 };
 
 }  // namespace view_manager
 
 #endif  // SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_