More work in Command Buffers...

command_buffer/service/cross/gl/sampler_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 47 matching lines @@
                  sampler::AddressingMode addressing_w,
                  sampler::FilteringMode mag_filter,
                  sampler::FilteringMode min_filter,
                  sampler::FilteringMode mip_filter,
                  unsigned int max_anisotropy);
 
   // Sets the border color states.
   void SetBorderColor(const RGBA &color);
 
   // Sets the texture.
-  void SetTexture(ResourceID texture) { texture_id_ = texture; }
+  void SetTexture(ResourceId texture) { texture_id_ = texture; }
 
   GLuint gl_texture() const { return gl_texture_; }
 
  private:
   GLenum gl_wrap_s_;
   GLenum gl_wrap_t_;
   GLenum gl_wrap_r_;
   GLenum gl_mag_filter_;
   GLenum gl_min_filter_;
   GLuint gl_max_anisotropy_;
   GLfloat gl_border_color_[4];
   GLuint gl_texture_;
-  ResourceID texture_id_;
+  ResourceId texture_id_;
 };
 
 }  // namespace command_buffer
 }  // namespace o3d
 
 #endif  // O3D_COMMAND_BUFFER_SERVICE_CROSS_GL_SAMPLER_GL_H_