| Index: ui/views/controls/button/custom_button.h
|
| diff --git a/ui/views/controls/button/custom_button.h b/ui/views/controls/button/custom_button.h
|
| index fcb07abcdcdce1df2381c4656fad371fd63674d5..03f9f3303cb0c20f03b675b60269dc57aeb5b22a 100644
|
| --- a/ui/views/controls/button/custom_button.h
|
| +++ b/ui/views/controls/button/custom_button.h
|
| @@ -87,7 +87,7 @@ class VIEWS_EXPORT CustomButton : public Button,
|
| virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE;
|
| virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
|
| virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE;
|
| - virtual ui::GestureStatus OnGestureEvent(
|
| + virtual ui::EventResult OnGestureEvent(
|
| const ui::GestureEvent& event) OVERRIDE;
|
| virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
|
| virtual void ShowContextMenu(const gfx::Point& p,
|
|
|