Revert vector icon CLs.

ui/views/controls/image_view.h

 // Copyright (c) 2012 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_VIEWS_CONTROLS_IMAGE_VIEW_H_
 #define UI_VIEWS_CONTROLS_IMAGE_VIEW_H_
 
-#include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/views/view.h"
 
 namespace gfx {
 class Canvas;
 }
 
 namespace views {
 
 class Painter;
 
@@ skipping 26 matching lines @@
 
   // Set the image that should be displayed from a pointer. Reset the image
   // if the pointer is NULL. The pointer contents is copied in the receiver's
   // image.
   void SetImage(const gfx::ImageSkia* image_skia);
 
   // Returns the image currently displayed or NULL of none is currently set.
   // The returned image is still owned by the ImageView.
   const gfx::ImageSkia& GetImage();
 
-  // Tells the view to draw a monochrome vector image identified by |id| using
-  // |color|. The size of the view and the image will be set to |image_size|.
-  void SetVectorIcon(gfx::VectorIconId id,
-                     SkColor color,
-                     const gfx::Size& image_size);
-
   // Set the desired image size for the receiving ImageView.
   void SetImageSize(const gfx::Size& image_size);
 
+  // Return the preferred size for the receiving view. Returns false if the
+  // preferred size is not defined, which means that the view uses the image
+  // size.
+  bool GetImageSize(gfx::Size* image_size) const;
+
   // Returns the actual bounds of the visible image inside the view.
   gfx::Rect GetImageBounds() const;
 
   // Reset the image size to the current image dimensions.
   void ResetImageSize();
 
   // Set / Get the horizontal alignment.
   void SetHorizontalAlignment(Alignment ha);
   Alignment GetHorizontalAlignment() const;
 
@@ skipping 16 matching lines @@
   void OnPaint(gfx::Canvas* canvas) override;
   void GetAccessibleState(ui::AXViewState* state) override;
   const char* GetClassName() const override;
   bool GetTooltipText(const gfx::Point& p,
                       base::string16* tooltip) const override;
   bool CanProcessEventsWithinSubtree() const override;
 
  private:
   void OnPaintImage(gfx::Canvas* canvas);
 
-  void OnPaintVectorIcon(gfx::Canvas* canvas);
-
   // Returns true if |img| is the same as the last image we painted. This is
   // intended to be a quick check, not exhaustive. In other words it's possible
   // for this to return false even though the images are in fact equal.
   bool IsImageEqual(const gfx::ImageSkia& img) const;
 
   // Compute the image origin given the desired size and the receiver alignment
   // properties.
   gfx::Point ComputeImageOrigin(const gfx::Size& image_size) const;
 
   // Whether the image size is set.
   bool image_size_set_;
 
   // The actual image size.
   gfx::Size image_size_;
 
   // The underlying image.
   gfx::ImageSkia image_;
 
-  // The ID of the vector icon that should be drawn, or gfx::VECTOR_ICON_NONE.
-  // This is drawn in addition to |image_|, but in most cases you probably want
-  // one or the other and not both.
-  gfx::VectorIconId vector_id_;
-
-  // The color to use when drawing the vector icon.
-  SkColor vector_color_;
-
   // Horizontal alignment.
   Alignment horiz_alignment_;
 
   // Vertical alignment.
   Alignment vert_alignment_;
 
   // The current tooltip text.
   base::string16 tooltip_text_;
 
   // A flag controlling hit test handling for interactivity.
   bool interactive_;
 
   // Scale last painted at.
   float last_paint_scale_;
 
   // Address of bytes we last painted. This is used only for comparison, so its
   // safe to cache.
   void* last_painted_bitmap_pixels_;
 
   scoped_ptr<views::Painter> focus_painter_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_IMAGE_VIEW_H_