OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <stdint.h> | 5 #include <stdint.h> |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "ash/mus/bridge/wm_window_mus.h" | |
11 #include "ash/mus/test/wm_test_base.h" | |
10 #include "ash/public/interfaces/user_window_controller.mojom.h" | 12 #include "ash/public/interfaces/user_window_controller.mojom.h" |
11 #include "base/bind.h" | 13 #include "base/bind.h" |
12 #include "base/macros.h" | 14 #include "base/macros.h" |
13 #include "base/run_loop.h" | 15 #include "base/run_loop.h" |
14 #include "services/shell/public/cpp/service_test.h" | 16 #include "services/shell/public/cpp/service_test.h" |
15 #include "services/ui/public/cpp/window.h" | 17 #include "services/ui/public/cpp/window.h" |
16 #include "services/ui/public/cpp/window_tree_client.h" | 18 #include "services/ui/public/cpp/window_tree_client.h" |
17 #include "services/ui/public/cpp/window_tree_client_delegate.h" | 19 #include "services/ui/public/cpp/window_tree_client_delegate.h" |
18 #include "services/ui/public/interfaces/window_tree.mojom.h" | 20 #include "services/ui/public/interfaces/window_tree.mojom.h" |
19 | 21 |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
149 new ::ui::WindowTreeClient(&window_tree_delegate, nullptr, nullptr)); | 151 new ::ui::WindowTreeClient(&window_tree_delegate, nullptr, nullptr)); |
150 client->ConnectViaWindowTreeFactory(connector()); | 152 client->ConnectViaWindowTreeFactory(connector()); |
151 ::ui::Window* top_level_window = client->NewTopLevelWindow(nullptr); | 153 ::ui::Window* top_level_window = client->NewTopLevelWindow(nullptr); |
152 ASSERT_TRUE(top_level_window); | 154 ASSERT_TRUE(top_level_window); |
153 | 155 |
154 observer.WaitUntilWindowCountReaches(1u); | 156 observer.WaitUntilWindowCountReaches(1u); |
155 client.reset(); | 157 client.reset(); |
156 observer.WaitUntilWindowCountReaches(0u); | 158 observer.WaitUntilWindowCountReaches(0u); |
157 } | 159 } |
158 | 160 |
161 TEST_F(WmTestBase, Fullscreen) { | |
James Cook
2016/07/15 18:35:23
nit: WmTestBase -> WindowManagerTest
riajiang
2016/07/20 14:16:17
Done.
| |
162 ::ui::Window* mus_window = CreateFullscreenTestWindow(); | |
163 WmWindow* window = WmWindowMus::Get(mus_window); | |
164 EXPECT_EQ(GetPrimaryRootWindow()->bounds(), window->GetBounds()); | |
165 } | |
166 | |
159 } // namespace mus | 167 } // namespace mus |
160 } // namespace ash | 168 } // namespace ash |
OLD | NEW |