Add new views::LabelButton and LabelButtonBorder.

ui/views/controls/image_view.h

Index: ui/views/controls/image_view.h
diff --git a/ui/views/controls/image_view.h b/ui/views/controls/image_view.h
index c00d536e93d339373e57a9fe513583f129fd5321..18c4ba13241ac01afe2d2604b3e361350dd32de5 100644
--- a/ui/views/controls/image_view.h
+++ b/ui/views/controls/image_view.h
@@ -73,12 +73,15 @@ class VIEWS_EXPORT ImageView : public View {
   void SetTooltipText(const string16& tooltip);
   string16 GetTooltipText() const;
 
-  // Overriden from View
+  void set_interactive(bool interactive) { interactive_ = interactive; }
+
+  // Overriden from View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
   virtual bool GetTooltipText(const gfx::Point& p,
                               string16* tooltip) const OVERRIDE;
+  virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
 
  private:
   // Compute the image origin given the desired size and the receiver alignment
@@ -103,6 +106,9 @@ class VIEWS_EXPORT ImageView : public View {
   // The current tooltip text.
   string16 tooltip_text_;
 
+  // A flag controlling hit test handling for interactivity.
+  bool interactive_;
+
   DISALLOW_COPY_AND_ASSIGN(ImageView);
 };