| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 bool OnWmSetProperty( | 50 bool OnWmSetProperty( |
| 51 Window* window, | 51 Window* window, |
| 52 const std::string& name, | 52 const std::string& name, |
| 53 std::unique_ptr<std::vector<uint8_t>>* new_data) override { | 53 std::unique_ptr<std::vector<uint8_t>>* new_data) override { |
| 54 return true; | 54 return true; |
| 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 OnWmClientJankinessChanged(const std::set<Window*>& client_windows, | 61 void OnWmClientJankinessChanged(const std::set<Window*>& client_windows, |
| 61 bool janky) override {} | 62 bool janky) override {} |
| 62 void OnWmNewDisplay(Window* window, | 63 void OnWmNewDisplay(Window* window, |
| 63 const display::Display& display) override {} | 64 const display::Display& display) override {} |
| 64 void OnWmPerformMoveLoop(Window* window, | 65 void OnWmPerformMoveLoop(Window* window, |
| 65 mojom::MoveLoopSource source, | 66 mojom::MoveLoopSource source, |
| 66 const gfx::Point& cursor_location, | 67 const gfx::Point& cursor_location, |
| 67 const base::Callback<void(bool)>& on_done) override { | 68 const base::Callback<void(bool)>& on_done) override { |
| 68 } | 69 } |
| 69 void OnWmCancelMoveLoop(Window* window) override {} | 70 void OnWmCancelMoveLoop(Window* window) override {} |
| (...skipping 1059 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1129 ASSERT_TRUE(window_in_wm); | 1130 ASSERT_TRUE(window_in_wm); |
| 1130 | 1131 |
| 1131 // Change the bounds in the wm, and make sure the child sees it. | 1132 // Change the bounds in the wm, and make sure the child sees it. |
| 1132 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101)); | 1133 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101)); |
| 1133 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_client)); | 1134 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_client)); |
| 1134 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_client->bounds()); | 1135 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_client->bounds()); |
| 1135 } | 1136 } |
| 1136 | 1137 |
| 1137 } // namespace ws | 1138 } // namespace ws |
| 1138 } // namespace ui | 1139 } // namespace ui |
| OLD | NEW |