Clean up ImageView.

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 "base/macros.h"
-#include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/view.h"
 
 namespace gfx {
 class Canvas;
 }
 
 namespace views {
 
-class Painter;
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // ImageView class.
 //
 // An ImageView can display an image from an ImageSkia. If a size is provided,
 // the ImageView will resize the provided image to fit if it is too big or will
 // center the image if smaller. Otherwise, the preferred size matches the
 // provided image size.
 //
 /////////////////////////////////////////////////////////////////////////////
@@ skipping 37 matching lines @@
   Alignment GetHorizontalAlignment() const;
 
   // Set / Get the vertical alignment.
   void SetVerticalAlignment(Alignment va);
   Alignment GetVerticalAlignment() const;
 
   // Set / Get the tooltip text.
   void SetTooltipText(const base::string16& tooltip);
   base::string16 GetTooltipText() const;
 
-  void set_interactive(bool interactive) { interactive_ = interactive; }
-
-  void SetFocusPainter(std::unique_ptr<Painter> focus_painter);
-
   // Overriden from View:
   gfx::Size GetPreferredSize() const override;
-  void OnFocus() override;
-  void OnBlur() override;
   void OnPaint(gfx::Canvas* canvas) override;
   void GetAccessibleNodeData(ui::AXNodeData* node_data) 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);
 
   // 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;
 
   // Returns the size the image will be painted.
@@ skipping 14 matching lines @@
 
   // 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_;
 
-  std::unique_ptr<views::Painter> focus_painter_;
-
   DISALLOW_COPY_AND_ASSIGN(ImageView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_IMAGE_VIEW_H_