Rename internal gfx::Image members to be less confusing with Cocoa types.

ui/gfx/image.h

 // Copyright (c) 2011 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.
 
 // An Image wraps an image any flavor, be it platform-native GdkBitmap/NSImage,
 // or a SkBitmap. This also provides easy conversion to other image types
 // through operator overloading. It will cache the converted representations
 // internally to prevent double-conversion.
 //
 // The lifetime of both the initial representation and any converted ones are
@@ skipping 25 matching lines @@
 namespace gfx {
 
 namespace internal {
 class ImageRep;
 class ImageStorage;
 }
 
 class Image {
  public:
   enum RepresentationType {
-    kGdkPixbufRep,
-    kNSImageRep,
-    kSkBitmapRep,
+    kImageRepGdk,
+    kImageRepCocoa,
+    kImageRepSkia,
   };
 
   typedef std::map<RepresentationType, internal::ImageRep*> RepresentationMap;
 
   // Creates a new image with the default representation. The object will take
   // ownership of the image.
   explicit Image(const SkBitmap* bitmap);
 
   // To create an Image that supports multiple resolutions pass a vector
   // of bitmaps, one for each resolution.
@@ skipping 62 matching lines @@
   // be cheaply copied.
   scoped_refptr<internal::ImageStorage> storage_;
 
   friend class ::ImageTest;
   friend class ::ImageMacTest;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_IMAGE_H_