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

command_buffer/service/cross/gl/effect_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 25 matching lines @@
 #define O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_EFFECT_GL_H_
 
 #include <vector>
 
 #include "command_buffer/common/cross/gapi_interface.h"
 #include "command_buffer/service/cross/resource.h"
 #include "command_buffer/service/cross/gl/gl_utils.h"
 
 namespace o3d {
 namespace command_buffer {
+namespace o3d {
 
 class GAPIGL;
 class EffectGL;
 
 // GL version of EffectParam.
 class EffectParamGL: public EffectParam {
  public:
   EffectParamGL(effect_param::DataType data_type,
                 EffectGL *effect,
                 unsigned int param_index);
@@ skipping 93 matching lines @@
   LowLevelParamList low_level_params_;
 
   // List of the indices of the low level params that are samplers.
   std::vector<unsigned int> sampler_params_;
   bool update_samplers_;
 
   friend class EffectParamGL;
   DISALLOW_COPY_AND_ASSIGN(EffectGL);
 };
 
-
+}  // namespace o3d
 }  // namespace command_buffer
 }  // namespace o3d
 
 #endif  // O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_EFFECT_GL_H_