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" |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 } | 55 } |
56 Window* OnWmCreateTopLevelWindow( | 56 Window* OnWmCreateTopLevelWindow( |
57 std::map<std::string, std::vector<uint8_t>>* properties) override { | 57 std::map<std::string, std::vector<uint8_t>>* properties) override { |
58 return nullptr; | 58 return nullptr; |
59 } | 59 } |
60 void OnWmDisplayRemoved(ui::Window* window) override {} | 60 void OnWmDisplayRemoved(ui::Window* window) override {} |
61 void OnWmClientJankinessChanged(const std::set<Window*>& client_windows, | 61 void OnWmClientJankinessChanged(const std::set<Window*>& client_windows, |
62 bool janky) override {} | 62 bool janky) override {} |
63 void OnWmNewDisplay(Window* window, | 63 void OnWmNewDisplay(Window* window, |
64 const display::Display& display) override {} | 64 const display::Display& display) override {} |
| 65 void OnWmDisplayModified(const display::Display& display) override {} |
65 void OnWmPerformMoveLoop(Window* window, | 66 void OnWmPerformMoveLoop(Window* window, |
66 mojom::MoveLoopSource source, | 67 mojom::MoveLoopSource source, |
67 const gfx::Point& cursor_location, | 68 const gfx::Point& cursor_location, |
68 const base::Callback<void(bool)>& on_done) override { | 69 const base::Callback<void(bool)>& on_done) override { |
69 } | 70 } |
70 void OnWmCancelMoveLoop(Window* window) override {} | 71 void OnWmCancelMoveLoop(Window* window) override {} |
71 | 72 |
72 private: | 73 private: |
73 DISALLOW_COPY_AND_ASSIGN(TestWindowManagerDelegate); | 74 DISALLOW_COPY_AND_ASSIGN(TestWindowManagerDelegate); |
74 }; | 75 }; |
(...skipping 1049 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1124 ASSERT_TRUE(window_in_wm); | 1125 ASSERT_TRUE(window_in_wm); |
1125 | 1126 |
1126 // Change the bounds in the wm, and make sure the child sees it. | 1127 // Change the bounds in the wm, and make sure the child sees it. |
1127 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101)); | 1128 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101)); |
1128 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_client)); | 1129 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_client)); |
1129 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_client->bounds()); | 1130 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_client->bounds()); |
1130 } | 1131 } |
1131 | 1132 |
1132 } // namespace ws | 1133 } // namespace ws |
1133 } // namespace ui | 1134 } // namespace ui |
OLD | NEW |