move all O3D specific command buffer stuff to command_buffer::o3d...

command_buffer/service/cross/gl/gapi_gl.h

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 32 matching lines @@
 #include "command_buffer/common/cross/gapi_interface.h"
 #include "command_buffer/service/cross/gl/gl_utils.h"
 #include "command_buffer/service/cross/gl/effect_gl.h"
 #include "command_buffer/service/cross/gl/geometry_gl.h"
 #include "command_buffer/service/cross/gl/render_surface_gl.h"
 #include "command_buffer/service/cross/gl/sampler_gl.h"
 #include "command_buffer/service/cross/gl/texture_gl.h"
 
 namespace o3d {
 namespace command_buffer {
+namespace o3d {
 #if defined(OS_LINUX)
 class XWindowWrapper;
 #endif  // defined(OS_LINUX)
 
 // This class implements the GAPI interface for GL.
 class GAPIGL : public GAPIInterface {
  public:
   GAPIGL();
   virtual ~GAPIGL();
 
@@ skipping 389 matching lines @@
   ResourceMap<IndexBufferGL> index_buffers_;
   ResourceMap<VertexStructGL> vertex_structs_;
   ResourceMap<EffectGL> effects_;
   ResourceMap<EffectParamGL> effect_params_;
   ResourceMap<TextureGL> textures_;
   ResourceMap<SamplerGL> samplers_;
   ResourceMap<RenderSurfaceGL> render_surfaces_;
   ResourceMap<RenderDepthStencilSurfaceGL> depth_surfaces_;
 };
 
+}  // namespace o3d
 }  // namespace command_buffer
 }  // namespace o3d
 
 #endif  // O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_GAPI_GL_H_