| 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/root_window.h" | 9 #include "ui/aura/root_window.h" |
| 10 #include "ui/aura/test/aura_test_base.h" | 10 #include "ui/aura/test/aura_test_base.h" |
| 11 #include "ui/aura/test/event_generator.h" | 11 #include "ui/aura/test/event_generator.h" |
| 12 #include "ui/aura/test/test_window_delegate.h" | 12 #include "ui/aura/test/test_window_delegate.h" |
| 13 #include "ui/aura/window.h" | 13 #include "ui/aura/window.h" |
| 14 #include "ui/base/hit_test.h" | 14 #include "ui/base/hit_test.h" |
| 15 | 15 |
| 16 namespace content { | 16 namespace content { |
| 17 | 17 |
| 18 void DispatchEventDuringScrollCallback(aura::WindowEventDispatcher* dispatcher, | 18 void DispatchEventDuringScrollCallback(aura::WindowEventDispatcher* dispatcher, |
| 19 ui::Event* event, | 19 ui::Event* event, |
| 20 ui::EventType type, | 20 ui::EventType type, |
| 21 const gfx::Vector2dF& delta) { | 21 const gfx::Vector2dF& delta) { |
| 22 if (type != ui::ET_GESTURE_SCROLL_UPDATE) | 22 if (type != ui::ET_GESTURE_SCROLL_UPDATE) |
| 23 return; | 23 return; |
| 24 aura::WindowTreeHostDelegate* delegate = | 24 aura::RootWindowHostDelegate* delegate = |
| 25 dispatcher->AsWindowTreeHostDelegate(); | 25 dispatcher->AsRootWindowHostDelegate(); |
| 26 if (event->IsMouseEvent()) | 26 if (event->IsMouseEvent()) |
| 27 delegate->OnHostMouseEvent(static_cast<ui::MouseEvent*>(event)); | 27 delegate->OnHostMouseEvent(static_cast<ui::MouseEvent*>(event)); |
| 28 else if (event->IsKeyEvent()) | 28 else if (event->IsKeyEvent()) |
| 29 delegate->OnHostKeyEvent(static_cast<ui::KeyEvent*>(event)); | 29 delegate->OnHostKeyEvent(static_cast<ui::KeyEvent*>(event)); |
| 30 } | 30 } |
| 31 | 31 |
| 32 void ChangeSliderOwnerDuringScrollCallback(scoped_ptr<aura::Window>* window, | 32 void ChangeSliderOwnerDuringScrollCallback(scoped_ptr<aura::Window>* window, |
| 33 WindowSlider* slider, | 33 WindowSlider* slider, |
| 34 ui::EventType type, | 34 ui::EventType type, |
| 35 const gfx::Vector2dF& delta) { | 35 const gfx::Vector2dF& delta) { |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 EXPECT_FALSE(slider_delegate.created_front_layer()); | 404 EXPECT_FALSE(slider_delegate.created_front_layer()); |
| 405 EXPECT_FALSE(slider_delegate.slide_aborted()); | 405 EXPECT_FALSE(slider_delegate.slide_aborted()); |
| 406 EXPECT_TRUE(slider_delegate.slider_destroyed()); | 406 EXPECT_TRUE(slider_delegate.slider_destroyed()); |
| 407 | 407 |
| 408 // Destroying the slider would have destroyed |window| too. So |window| should | 408 // Destroying the slider would have destroyed |window| too. So |window| should |
| 409 // not need to be destroyed here. | 409 // not need to be destroyed here. |
| 410 EXPECT_EQ(child_windows, root_window()->children().size()); | 410 EXPECT_EQ(child_windows, root_window()->children().size()); |
| 411 } | 411 } |
| 412 | 412 |
| 413 } // namespace content | 413 } // namespace content |
| OLD | NEW |