| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "ui/aura/root_window.h" | |
| 6 #include "ui/aura/test/aura_test_base.h" | 5 #include "ui/aura/test/aura_test_base.h" |
| 7 #include "ui/aura/test/test_windows.h" | 6 #include "ui/aura/test/test_windows.h" |
| 8 #include "ui/aura/window.h" | 7 #include "ui/aura/window.h" |
| 8 #include "ui/aura/window_event_dispatcher.h" |
| 9 #include "ui/compositor/layer.h" | 9 #include "ui/compositor/layer.h" |
| 10 #include "ui/compositor/test/test_layers.h" | 10 #include "ui/compositor/test/test_layers.h" |
| 11 #include "ui/views/view.h" | 11 #include "ui/views/view.h" |
| 12 #include "ui/views/view_constants_aura.h" | 12 #include "ui/views/view_constants_aura.h" |
| 13 #include "ui/views/widget/widget.h" | 13 #include "ui/views/widget/widget.h" |
| 14 | 14 |
| 15 namespace views { | 15 namespace views { |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 // Creates a control widget with the passed in parameters. | 18 // Creates a control widget with the passed in parameters. |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 EXPECT_EQ("v1 v2 w", | 254 EXPECT_EQ("v1 v2 w", |
| 255 ui::test::ChildLayerNamesAsString(*parent_window->layer())); | 255 ui::test::ChildLayerNamesAsString(*parent_window->layer())); |
| 256 | 256 |
| 257 // Work around for bug in NativeWidgetAura. | 257 // Work around for bug in NativeWidgetAura. |
| 258 // TODO: fix bug and remove this. | 258 // TODO: fix bug and remove this. |
| 259 parent->Close(); | 259 parent->Close(); |
| 260 } | 260 } |
| 261 | 261 |
| 262 } // namespace | 262 } // namespace |
| 263 } // namespace views | 263 } // namespace views |
| OLD | NEW |