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 <stddef.h> | 5 #include <stddef.h> |
6 #include <stdint.h> | 6 #include <stdint.h> |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
12 #include "components/mus/common/util.h" | 12 #include "components/mus/common/util.h" |
13 #include "components/mus/public/cpp/lib/window_private.h" | 13 #include "components/mus/public/cpp/lib/window_private.h" |
14 #include "components/mus/public/cpp/lib/window_tree_client_impl.h" | 14 #include "components/mus/public/cpp/lib/window_tree_client_impl.h" |
15 #include "components/mus/public/cpp/tests/window_server_test_base.h" | 15 #include "components/mus/public/cpp/tests/window_server_test_base.h" |
16 #include "components/mus/public/cpp/window_observer.h" | 16 #include "components/mus/public/cpp/window_observer.h" |
17 #include "components/mus/public/cpp/window_tree_connection.h" | 17 #include "components/mus/public/cpp/window_tree_connection.h" |
18 #include "components/mus/public/cpp/window_tree_connection_observer.h" | 18 #include "components/mus/public/cpp/window_tree_connection_observer.h" |
19 #include "components/mus/public/cpp/window_tree_delegate.h" | 19 #include "components/mus/public/cpp/window_tree_delegate.h" |
20 #include "ui/gfx/geometry/mojo/geometry_type_converters.h" | |
21 #include "ui/gfx/geometry/mojo/geometry_util.h" | |
22 #include "ui/gfx/geometry/rect.h" | 20 #include "ui/gfx/geometry/rect.h" |
23 | 21 |
24 namespace mus { | 22 namespace mus { |
25 namespace ws { | 23 namespace ws { |
26 | 24 |
27 namespace { | 25 namespace { |
28 | 26 |
29 Id server_id(mus::Window* window) { | 27 Id server_id(mus::Window* window) { |
30 return WindowPrivate(window).server_id(); | 28 return WindowPrivate(window).server_id(); |
31 } | 29 } |
(...skipping 1133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1165 ASSERT_TRUE(window_in_wm); | 1163 ASSERT_TRUE(window_in_wm); |
1166 | 1164 |
1167 // Change the bounds in the wm, and make sure the child sees it. | 1165 // Change the bounds in the wm, and make sure the child sees it. |
1168 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101)); | 1166 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101)); |
1169 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_connection)); | 1167 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_connection)); |
1170 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_connection->bounds()); | 1168 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_connection->bounds()); |
1171 } | 1169 } |
1172 | 1170 |
1173 } // namespace ws | 1171 } // namespace ws |
1174 } // namespace mus | 1172 } // namespace mus |
OLD | NEW |