| 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 "ui/views/corewm/transient_window_manager.h" | 5 #include "ui/wm/core/transient_window_manager.h" |
| 6 | 6 |
| 7 #include "ui/aura/client/visibility_client.h" | 7 #include "ui/aura/client/visibility_client.h" |
| 8 #include "ui/aura/client/window_tree_client.h" | 8 #include "ui/aura/client/window_tree_client.h" |
| 9 #include "ui/aura/layout_manager.h" | 9 #include "ui/aura/layout_manager.h" |
| 10 #include "ui/aura/test/aura_test_base.h" | 10 #include "ui/aura/test/aura_test_base.h" |
| 11 #include "ui/aura/test/test_windows.h" | 11 #include "ui/aura/test/test_windows.h" |
| 12 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" |
| 13 #include "ui/views/corewm/transient_window_observer.h" | 13 #include "ui/wm/core/transient_window_observer.h" |
| 14 #include "ui/views/corewm/window_util.h" | 14 #include "ui/wm/core/window_util.h" |
| 15 #include "ui/views/corewm/wm_state.h" | 15 #include "ui/wm/core/wm_state.h" |
| 16 | 16 |
| 17 using aura::Window; | 17 using aura::Window; |
| 18 | 18 |
| 19 using aura::test::ChildWindowIDsAsString; | 19 using aura::test::ChildWindowIDsAsString; |
| 20 using aura::test::CreateTestWindowWithId; | 20 using aura::test::CreateTestWindowWithId; |
| 21 | 21 |
| 22 namespace views { | 22 namespace views { |
| 23 namespace corewm { | 23 namespace corewm { |
| 24 | 24 |
| 25 class TestTransientWindowObserver : public TransientWindowObserver { | 25 class TestTransientWindowObserver : public TransientWindowObserver { |
| (...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 629 | 629 |
| 630 RemoveTransientChild(parent.get(), w1.get()); | 630 RemoveTransientChild(parent.get(), w1.get()); |
| 631 EXPECT_EQ(1, test_observer.add_count()); | 631 EXPECT_EQ(1, test_observer.add_count()); |
| 632 EXPECT_EQ(1, test_observer.remove_count()); | 632 EXPECT_EQ(1, test_observer.remove_count()); |
| 633 | 633 |
| 634 TransientWindowManager::Get(parent.get())->RemoveObserver(&test_observer); | 634 TransientWindowManager::Get(parent.get())->RemoveObserver(&test_observer); |
| 635 } | 635 } |
| 636 | 636 |
| 637 } // namespace corewm | 637 } // namespace corewm |
| 638 } // namespace views | 638 } // namespace views |
| OLD | NEW |