| 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 26 matching lines...) Expand all Loading... |
| 37 return (it != windows.end()) ? (it - windows.begin()) : -1; | 37 return (it != windows.end()) ? (it - windows.begin()) : -1; |
| 38 } | 38 } |
| 39 | 39 |
| 40 class TestWindowManagerDelegate : public WindowManagerDelegate { | 40 class TestWindowManagerDelegate : public WindowManagerDelegate { |
| 41 public: | 41 public: |
| 42 TestWindowManagerDelegate() {} | 42 TestWindowManagerDelegate() {} |
| 43 ~TestWindowManagerDelegate() override {} | 43 ~TestWindowManagerDelegate() override {} |
| 44 | 44 |
| 45 // WindowManagerDelegate: | 45 // WindowManagerDelegate: |
| 46 void SetWindowManagerClient(WindowManagerClient* client) override {} | 46 void SetWindowManagerClient(WindowManagerClient* client) override {} |
| 47 bool OnWmSetBounds(Window* window, gfx::Rect* bounds) override { | 47 void OnWmSetBounds(Window* window, const gfx::Rect& bounds) override {} |
| 48 return false; | |
| 49 } | |
| 50 bool OnWmSetProperty( | 48 bool OnWmSetProperty( |
| 51 Window* window, | 49 Window* window, |
| 52 const std::string& name, | 50 const std::string& name, |
| 53 std::unique_ptr<std::vector<uint8_t>>* new_data) override { | 51 std::unique_ptr<std::vector<uint8_t>>* new_data) override { |
| 54 return true; | 52 return true; |
| 55 } | 53 } |
| 56 Window* OnWmCreateTopLevelWindow( | 54 Window* OnWmCreateTopLevelWindow( |
| 57 std::map<std::string, std::vector<uint8_t>>* properties) override { | 55 std::map<std::string, std::vector<uint8_t>>* properties) override { |
| 58 return nullptr; | 56 return nullptr; |
| 59 } | 57 } |
| (...skipping 1065 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1125 ASSERT_TRUE(window_in_wm); | 1123 ASSERT_TRUE(window_in_wm); |
| 1126 | 1124 |
| 1127 // Change the bounds in the wm, and make sure the child sees it. | 1125 // Change the bounds in the wm, and make sure the child sees it. |
| 1128 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101)); | 1126 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101)); |
| 1129 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_client)); | 1127 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_client)); |
| 1130 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_client->bounds()); | 1128 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_client->bounds()); |
| 1131 } | 1129 } |
| 1132 | 1130 |
| 1133 } // namespace ws | 1131 } // namespace ws |
| 1134 } // namespace ui | 1132 } // namespace ui |
| OLD | NEW |