Mandoline: Merge Surfaces and Views apps

components/view_manager/surfaces/surfaces_impl.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 COMPONENTS_VIEW_MANAGER_SURFACES_SURFACES_IMPL_H_
 #define COMPONENTS_VIEW_MANAGER_SURFACES_SURFACES_IMPL_H_
 
 #include "cc/surfaces/display_client.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
@@ skipping 39 matching lines @@
   void ReturnResources(const cc::ReturnedResourceArray& resources) override;
 
   cc::SurfaceFactory* factory() { return &factory_; }
 
  private:
   ~SurfacesImpl() override;
 
   cc::SurfaceId QualifyIdentifier(uint32_t local_id);
 
   SurfacesDelegate* delegate_;
+  // A Surface ID is an unsigned 64-bit int where the high 32-bits are generated
+  // by the Surfaces service, and the low 32-bits are generated by the process
+  // that requested the Surface.
   scoped_refptr<SurfacesState> state_;
   // A Surface ID is an unsigned 64-bit int where the high 32-bits are generated
   // by the Surfaces service, and the low 32-bits are generated by the process
   // that requested the Surface.
   const uint32_t id_namespace_;
   cc::SurfaceFactory factory_;
   mojo::ScopedMessagePipeHandle command_buffer_handle_;
   mojo::ResourceReturnerPtr returner_;
   mojo::Binding<Surface> binding_;
   bool connection_closed_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfacesImpl);
 };
 
 }  // namespace surfaces
 
 #endif  // COMPONENTS_VIEW_MANAGER_SURFACES_SURFACES_IMPL_H_