OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "content/browser/web_contents/aura/overscroll_window_delegate.h" | 5 #include "content/browser/web_contents/aura/overscroll_window_delegate.h" |
6 | 6 |
| 7 #include "base/macros.h" |
7 #include "content/browser/renderer_host/overscroll_controller_delegate.h" | 8 #include "content/browser/renderer_host/overscroll_controller_delegate.h" |
8 #include "content/public/browser/overscroll_configuration.h" | 9 #include "content/public/browser/overscroll_configuration.h" |
9 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
10 #include "ui/aura/test/aura_test_base.h" | 11 #include "ui/aura/test/aura_test_base.h" |
11 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" |
12 #include "ui/events/gesture_detection/gesture_configuration.h" | 13 #include "ui/events/gesture_detection/gesture_configuration.h" |
13 #include "ui/events/test/event_generator.h" | 14 #include "ui/events/test/event_generator.h" |
14 | 15 |
15 namespace content { | 16 namespace content { |
16 | 17 |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 EXPECT_EQ(current_mode(), OVERSCROLL_NONE); | 243 EXPECT_EQ(current_mode(), OVERSCROLL_NONE); |
243 EXPECT_FALSE(overscroll_complete()); | 244 EXPECT_FALSE(overscroll_complete()); |
244 | 245 |
245 // We should be able to restart the overscroll without lifting the finger. | 246 // We should be able to restart the overscroll without lifting the finger. |
246 generator.MoveTouch(gfx::Point(touch_x + touch_start_threshold() + 1, 0)); | 247 generator.MoveTouch(gfx::Point(touch_x + touch_start_threshold() + 1, 0)); |
247 EXPECT_EQ(current_mode(), OVERSCROLL_EAST); | 248 EXPECT_EQ(current_mode(), OVERSCROLL_EAST); |
248 EXPECT_FALSE(overscroll_complete()); | 249 EXPECT_FALSE(overscroll_complete()); |
249 } | 250 } |
250 | 251 |
251 } // namespace content | 252 } // namespace content |
OLD | NEW |