| Index: ui/views/controls/link.h
|
| ===================================================================
|
| --- ui/views/controls/link.h (revision 239550)
|
| +++ ui/views/controls/link.h (working copy)
|
| @@ -33,13 +33,9 @@
|
| const LinkListener* listener() { return listener_; }
|
| void set_listener(LinkListener* listener) { listener_ = listener; }
|
|
|
| - // Overridden from View:
|
| - virtual void OnEnabledChanged() OVERRIDE;
|
| + // Label:
|
| virtual const char* GetClassName() const OVERRIDE;
|
| virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) OVERRIDE;
|
| - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
|
| - virtual void OnFocus() OVERRIDE;
|
| - virtual void OnBlur() OVERRIDE;
|
| virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
|
| virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
|
| virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE;
|
| @@ -46,17 +42,18 @@
|
| virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
|
| virtual void OnMouseCaptureLost() OVERRIDE;
|
| virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
|
| + virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
|
| virtual bool SkipDefaultKeyEventProcessing(
|
| const ui::KeyEvent& event) OVERRIDE;
|
| virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
|
| -
|
| - // Overridden from ui::EventHandler:
|
| - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
|
| -
|
| - // Overridden from Label:
|
| + virtual void OnEnabledChanged() OVERRIDE;
|
| + virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
|
| + virtual void OnFocus() OVERRIDE;
|
| + virtual void OnBlur() OVERRIDE;
|
| virtual void SetFont(const gfx::Font& font) OVERRIDE;
|
| + virtual void SetText(const string16& text) OVERRIDE;
|
| + virtual void SetEnabledColor(SkColor color) OVERRIDE;
|
|
|
| - virtual void SetEnabledColor(SkColor color) OVERRIDE;
|
| void SetPressedColor(SkColor color);
|
| void SetUnderline(bool underline);
|
|
|
|
|