OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/window_slider.h" | 5 #include "content/browser/web_contents/aura/window_slider.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "testing/gtest/include/gtest/gtest.h" | 8 #include "testing/gtest/include/gtest/gtest.h" |
9 #include "ui/aura/test/aura_test_base.h" | 9 #include "ui/aura/test/aura_test_base.h" |
10 #include "ui/aura/test/event_generator.h" | 10 #include "ui/aura/test/event_generator.h" |
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
258 new WindowSlider(&slider_delegate, root_window(), window.get()); | 258 new WindowSlider(&slider_delegate, root_window(), window.get()); |
259 for (int i = 0; events[i]; ++i) { | 259 for (int i = 0; events[i]; ++i) { |
260 // Generate a horizontal overscroll. | 260 // Generate a horizontal overscroll. |
261 aura::test::EventGenerator generator(root_window()); | 261 aura::test::EventGenerator generator(root_window()); |
262 generator.GestureScrollSequenceWithCallback( | 262 generator.GestureScrollSequenceWithCallback( |
263 gfx::Point(10, 10), | 263 gfx::Point(10, 10), |
264 gfx::Point(80, 10), | 264 gfx::Point(80, 10), |
265 base::TimeDelta::FromMilliseconds(10), | 265 base::TimeDelta::FromMilliseconds(10), |
266 1, | 266 1, |
267 base::Bind(&DispatchEventDuringScrollCallback, | 267 base::Bind(&DispatchEventDuringScrollCallback, |
268 root_window()->GetDispatcher(), | 268 root_window()->GetHost()->dispatcher(), |
269 base::Owned(events[i]))); | 269 base::Owned(events[i]))); |
270 EXPECT_TRUE(slider_delegate.created_back_layer()); | 270 EXPECT_TRUE(slider_delegate.created_back_layer()); |
271 EXPECT_TRUE(slider_delegate.slide_aborted()); | 271 EXPECT_TRUE(slider_delegate.slide_aborted()); |
272 EXPECT_FALSE(slider_delegate.created_front_layer()); | 272 EXPECT_FALSE(slider_delegate.created_front_layer()); |
273 EXPECT_FALSE(slider_delegate.slide_completed()); | 273 EXPECT_FALSE(slider_delegate.slide_completed()); |
274 EXPECT_FALSE(slider_delegate.slider_destroyed()); | 274 EXPECT_FALSE(slider_delegate.slider_destroyed()); |
275 slider_delegate.Reset(); | 275 slider_delegate.Reset(); |
276 } | 276 } |
277 window.reset(); | 277 window.reset(); |
278 EXPECT_TRUE(slider_delegate.slider_destroyed()); | 278 EXPECT_TRUE(slider_delegate.slider_destroyed()); |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
400 EXPECT_FALSE(slider_delegate.created_front_layer()); | 400 EXPECT_FALSE(slider_delegate.created_front_layer()); |
401 EXPECT_FALSE(slider_delegate.slide_aborted()); | 401 EXPECT_FALSE(slider_delegate.slide_aborted()); |
402 EXPECT_TRUE(slider_delegate.slider_destroyed()); | 402 EXPECT_TRUE(slider_delegate.slider_destroyed()); |
403 | 403 |
404 // Destroying the slider would have destroyed |window| too. So |window| should | 404 // Destroying the slider would have destroyed |window| too. So |window| should |
405 // not need to be destroyed here. | 405 // not need to be destroyed here. |
406 EXPECT_EQ(child_windows, root_window()->children().size()); | 406 EXPECT_EQ(child_windows, root_window()->children().size()); |
407 } | 407 } |
408 | 408 |
409 } // namespace content | 409 } // namespace content |
OLD | NEW |