| Index: content/browser/renderer_host/input/touch_selection_controller_unittest.cc
|
| diff --git a/content/browser/renderer_host/input/touch_selection_controller_unittest.cc b/content/browser/renderer_host/input/touch_selection_controller_unittest.cc
|
| index 5bdf57273fdadb5440308246953041cd8361dde9..1ffd38497b8910ce8bb8cb92bc3496669f206f18 100644
|
| --- a/content/browser/renderer_host/input/touch_selection_controller_unittest.cc
|
| +++ b/content/browser/renderer_host/input/touch_selection_controller_unittest.cc
|
| @@ -20,12 +20,12 @@ class MockTouchHandleDrawable : public TouchHandleDrawable {
|
| explicit MockTouchHandleDrawable(bool* contains_point)
|
| : intersects_rect_(contains_point) {}
|
| virtual ~MockTouchHandleDrawable() {}
|
| - virtual void SetEnabled(bool enabled) OVERRIDE {}
|
| - virtual void SetOrientation(TouchHandleOrientation orientation) OVERRIDE {}
|
| - virtual void SetAlpha(float alpha) OVERRIDE {}
|
| - virtual void SetFocus(const gfx::PointF& position) OVERRIDE {}
|
| - virtual void SetVisible(bool visible) OVERRIDE {}
|
| - virtual bool IntersectsWith(const gfx::RectF& rect) const OVERRIDE {
|
| + virtual void SetEnabled(bool enabled) override {}
|
| + virtual void SetOrientation(TouchHandleOrientation orientation) override {}
|
| + virtual void SetAlpha(float alpha) override {}
|
| + virtual void SetFocus(const gfx::PointF& position) override {}
|
| + virtual void SetVisible(bool visible) override {}
|
| + virtual bool IntersectsWith(const gfx::RectF& rect) const override {
|
| return *intersects_rect_;
|
| }
|
|
|
| @@ -49,40 +49,40 @@ class TouchSelectionControllerTest : public testing::Test,
|
| virtual ~TouchSelectionControllerTest() {}
|
|
|
| // testing::Test implementation.
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| controller_.reset(new TouchSelectionController(
|
| this,
|
| base::TimeDelta::FromMilliseconds(kDefaultTapTimeoutMs),
|
| kDefaulTapSlop));
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE { controller_.reset(); }
|
| + virtual void TearDown() override { controller_.reset(); }
|
|
|
| // TouchSelectionControllerClient implementation.
|
|
|
| - virtual bool SupportsAnimation() const OVERRIDE { return animation_enabled_; }
|
| + virtual bool SupportsAnimation() const override { return animation_enabled_; }
|
|
|
| - virtual void SetNeedsAnimate() OVERRIDE { needs_animate_ = true; }
|
| + virtual void SetNeedsAnimate() override { needs_animate_ = true; }
|
|
|
| - virtual void MoveCaret(const gfx::PointF& position) OVERRIDE {
|
| + virtual void MoveCaret(const gfx::PointF& position) override {
|
| caret_moved_ = true;
|
| caret_position_ = position;
|
| }
|
|
|
| virtual void SelectBetweenCoordinates(const gfx::PointF& start,
|
| - const gfx::PointF& end) OVERRIDE {
|
| + const gfx::PointF& end) override {
|
| selection_moved_ = true;
|
| selection_start_ = start;
|
| selection_end_ = end;
|
| }
|
|
|
| virtual void OnSelectionEvent(SelectionEventType event,
|
| - const gfx::PointF& end_position) OVERRIDE {
|
| + const gfx::PointF& end_position) override {
|
| last_event_ = event;
|
| last_event_start_ = end_position;
|
| }
|
|
|
| - virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() OVERRIDE {
|
| + virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() override {
|
| return scoped_ptr<TouchHandleDrawable>(
|
| new MockTouchHandleDrawable(&dragging_enabled_));
|
| }
|
|
|