Add new views::LabelButton and LabelButtonBorder.

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 "ui/gfx/image/image_skia.h"
 #include "ui/views/view.h"
 
@@ skipping 55 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 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
   // 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_;
 
   // Horizontal alignment.
   Alignment horiz_alignment_;
 
   // Vertical alignment.
   Alignment vert_alignment_;
 
   // The current tooltip text.
   string16 tooltip_text_;
 
+  // A flag controlling hit test handling for interactivity.
+  bool interactive_;
+
   DISALLOW_COPY_AND_ASSIGN(ImageView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_IMAGE_VIEW_H_