| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/test/aura_test_base.h" | 5 #include "ui/aura/test/aura_test_base.h" |
| 6 #include "ui/aura/window.h" | 6 #include "ui/aura/window.h" |
| 7 #include "ui/aura_shell/shell.h" | 7 #include "ui/aura_shell/shell.h" |
| 8 #include "ui/aura_shell/shell_window_ids.h" | 8 #include "ui/aura_shell/shell_window_ids.h" |
| 9 #include "ui/aura_shell/test/aura_shell_test_base.h" | 9 #include "ui/aura_shell/test/aura_shell_test_base.h" |
| 10 #include "views/widget/widget.h" | 10 #include "ui/views/widget/widget.h" |
| 11 | 11 |
| 12 namespace aura_shell { | 12 namespace aura_shell { |
| 13 namespace test { | 13 namespace test { |
| 14 | 14 |
| 15 namespace { | 15 namespace { |
| 16 | 16 |
| 17 views::Widget* CreateTestWindow(const views::Widget::InitParams& params) { | 17 views::Widget* CreateTestWindow(const views::Widget::InitParams& params) { |
| 18 views::Widget* widget = new views::Widget; | 18 views::Widget* widget = new views::Widget; |
| 19 widget->Init(params); | 19 widget->Init(params); |
| 20 return widget; | 20 return widget; |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 // Set the same always-on-top flag again. | 98 // Set the same always-on-top flag again. |
| 99 widget->SetAlwaysOnTop(false); | 99 widget->SetAlwaysOnTop(false); |
| 100 // Should have no effect and we are still in the default container. | 100 // Should have no effect and we are still in the default container. |
| 101 EXPECT_EQ(GetDefaultContainer(), widget->GetNativeWindow()->parent()); | 101 EXPECT_EQ(GetDefaultContainer(), widget->GetNativeWindow()->parent()); |
| 102 | 102 |
| 103 widget->Close(); | 103 widget->Close(); |
| 104 } | 104 } |
| 105 | 105 |
| 106 } // namespace test | 106 } // namespace test |
| 107 } // namespace aura_shell | 107 } // namespace aura_shell |
| OLD | NEW |