| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "athena/util/drag_handle.h" | 5 #include "athena/util/drag_handle.h" |
| 6 | 6 |
| 7 #include "ui/aura/test/aura_test_base.h" | 7 #include "ui/aura/test/aura_test_base.h" |
| 8 #include "ui/aura/window.h" | 8 #include "ui/aura/window.h" |
| 9 #include "ui/views/view.h" | 9 #include "ui/views/view.h" |
| 10 #include "ui/views/widget/widget.h" | 10 #include "ui/views/widget/widget.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 got_scroll_end_ = false; | 25 got_scroll_end_ = false; |
| 26 update_delta_ = 0; | 26 update_delta_ = 0; |
| 27 } | 27 } |
| 28 | 28 |
| 29 float begin_delta() { return begin_delta_; } | 29 float begin_delta() { return begin_delta_; } |
| 30 bool got_scroll_end() { return got_scroll_end_; } | 30 bool got_scroll_end() { return got_scroll_end_; } |
| 31 float update_delta() { return update_delta_; } | 31 float update_delta() { return update_delta_; } |
| 32 | 32 |
| 33 private: | 33 private: |
| 34 // DragHandleScrollDelegate: | 34 // DragHandleScrollDelegate: |
| 35 virtual void HandleScrollBegin(float delta) OVERRIDE { | 35 virtual void HandleScrollBegin(float delta) override { |
| 36 begin_delta_ = delta; | 36 begin_delta_ = delta; |
| 37 } | 37 } |
| 38 | 38 |
| 39 virtual void HandleScrollEnd() OVERRIDE { | 39 virtual void HandleScrollEnd() override { |
| 40 got_scroll_end_ = true; | 40 got_scroll_end_ = true; |
| 41 } | 41 } |
| 42 | 42 |
| 43 virtual void HandleScrollUpdate(float delta) OVERRIDE { | 43 virtual void HandleScrollUpdate(float delta) override { |
| 44 update_delta_ = delta; | 44 update_delta_ = delta; |
| 45 } | 45 } |
| 46 | 46 |
| 47 float begin_delta_; | 47 float begin_delta_; |
| 48 bool got_scroll_end_; | 48 bool got_scroll_end_; |
| 49 float update_delta_; | 49 float update_delta_; |
| 50 | 50 |
| 51 DISALLOW_COPY_AND_ASSIGN(DragHandleDelegateTest); | 51 DISALLOW_COPY_AND_ASSIGN(DragHandleDelegateTest); |
| 52 }; | 52 }; |
| 53 | 53 |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 e = ui::GestureEvent(fling_start_model); | 131 e = ui::GestureEvent(fling_start_model); |
| 132 widget.OnGestureEvent(&e); | 132 widget.OnGestureEvent(&e); |
| 133 EXPECT_TRUE(delegate.got_scroll_end()); | 133 EXPECT_TRUE(delegate.got_scroll_end()); |
| 134 | 134 |
| 135 delegate.Reset(); | 135 delegate.Reset(); |
| 136 | 136 |
| 137 drag_handle.reset(); | 137 drag_handle.reset(); |
| 138 } | 138 } |
| 139 | 139 |
| 140 } // namespace athena | 140 } // namespace athena |
| OLD | NEW |