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

command_buffer/service/win/d3d9/sampler_d3d9.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 24 matching lines @@
 
 #ifndef O3D_COMMAND_BUFFER_SERVICE_WIN_D3D9_SAMPLER_D3D9_H_
 #define O3D_COMMAND_BUFFER_SERVICE_WIN_D3D9_SAMPLER_D3D9_H_
 
 #include "command_buffer/common/cross/gapi_interface.h"
 #include "command_buffer/service/win/d3d9/d3d9_utils.h"
 #include "command_buffer/service/cross/resource.h"
 
 namespace o3d {
 namespace command_buffer {
+namespace o3d {
 
 class GAPID3D9;
 
 // D3D9 version of Sampler.
 class SamplerD3D9 : public Sampler {
  public:
   SamplerD3D9();
 
   // Applies sampler states to D3D.
   bool ApplyStates(GAPID3D9 *gapi, unsigned int unit) const;
@@ skipping 17 matching lines @@
   D3DTEXTUREADDRESS d3d_address_v_;
   D3DTEXTUREADDRESS d3d_address_w_;
   D3DTEXTUREFILTERTYPE d3d_mag_filter_;
   D3DTEXTUREFILTERTYPE d3d_min_filter_;
   D3DTEXTUREFILTERTYPE d3d_mip_filter_;
   DWORD d3d_max_anisotropy_;
   D3DCOLOR d3d_border_color_;
   ResourceId texture_id_;
 };
 
+}  // namespace o3d
 }  // namespace command_buffer
 }  // namespace o3d
 
 #endif  // O3D_COMMAND_BUFFER_SERVICE_WIN_D3D9_SAMPLER_D3D9_H_