| Index: ui/views/controls/label.h
|
| diff --git a/ui/views/controls/label.h b/ui/views/controls/label.h
|
| index 45f01988018f59bb311a3fa425be0ceb35fb272c..b1fd24aff34c929561196cff5d340e3a2645d39a 100644
|
| --- a/ui/views/controls/label.h
|
| +++ b/ui/views/controls/label.h
|
| @@ -185,7 +185,6 @@ class VIEWS_EXPORT Label : public View {
|
| virtual int GetHeightForWidth(int w) const OVERRIDE;
|
| virtual const char* GetClassName() const OVERRIDE;
|
| virtual View* GetTooltipHandlerForPoint(const gfx::Point& point) OVERRIDE;
|
| - virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
|
| virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
|
| // Gets the tooltip text for labels that are wider than their bounds, except
|
| // when the label is multiline, in which case it just returns false (no
|
| @@ -194,6 +193,9 @@ class VIEWS_EXPORT Label : public View {
|
| virtual bool GetTooltipText(const gfx::Point& p,
|
| base::string16* tooltip) const OVERRIDE;
|
|
|
| + // ui::EventTarget:
|
| + virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE;
|
| +
|
| protected:
|
| // Called by Paint to paint the text. Override this to change how
|
| // text is painted.
|
|
|