Remove last dependencies on ui/base from ui/gfx

ui/gfx/image/image_family.h

 // Copyright 2013 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.
 
 #ifndef UI_GFX_IMAGE_IMAGE_FAMILY_H_
 #define UI_GFX_IMAGE_IMAGE_FAMILY_H_
 
 #include <iterator>
 #include <map>
 #include <utility>
 
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/image/image.h"
 
 namespace gfx {
 class ImageSkia;
 class Size;
 
 // A collection of images at different sizes. The images should be different
 // representations of the same basic concept (for example, an icon) at various
 // sizes and (optionally) aspect ratios. A method is provided for finding the
 // most appropriate image to fit in a given rectangle.
 //
 // NOTE: This is not appropriate for storing an image at a single logical pixel
 // size, with high-DPI bitmap versions; use an Image or ImageSkia for that. Each
 // image in an ImageFamily should have a different logical size (and may also
 // include high-DPI representations).
-class UI_EXPORT ImageFamily {
+class GFX_EXPORT ImageFamily {
  private:
   // An <aspect ratio, DIP width> pair.
   // A 0x0 image has aspect ratio 1.0. 0xN and Nx0 images are treated as 0x0.
   struct MapKey : std::pair<float, int> {
     MapKey(float aspect, int width)
         : std::pair<float, int>(aspect, width) {}
 
     float aspect() const { return first; }
 
     int width() const { return second; }
   };
 
  public:
   // Type for iterating over all images in the family, in order.
   // Dereferencing this iterator returns a gfx::Image.
-  class UI_EXPORT const_iterator :
+  class GFX_EXPORT const_iterator :
     std::iterator<std::bidirectional_iterator_tag, const gfx::Image> {
    public:
     const_iterator();
 
     const_iterator(const const_iterator& other);
 
     const_iterator& operator++() {
       ++map_iterator_;
       return *this;
     }
@@ skipping 92 matching lines @@
   // |map_| of aspect ratio |aspect|.
   const gfx::Image* GetWithExactAspect(float aspect, int width) const;
 
   // Map from (aspect ratio, width) to image.
   std::map<MapKey, gfx::Image> map_;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_IMAGE_IMAGE_FAMILY_H_