| 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 const std::string& name, | 53 const std::string& name, |
| 54 std::unique_ptr<std::vector<uint8_t>>* new_data) override { | 54 std::unique_ptr<std::vector<uint8_t>>* new_data) override { |
| 55 return true; | 55 return true; |
| 56 } | 56 } |
| 57 Window* OnWmCreateTopLevelWindow( | 57 Window* OnWmCreateTopLevelWindow( |
| 58 std::map<std::string, std::vector<uint8_t>>* properties) override { | 58 std::map<std::string, std::vector<uint8_t>>* properties) override { |
| 59 return nullptr; | 59 return nullptr; |
| 60 } | 60 } |
| 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, |
| 64 const display::Display& display) override {} |
| 63 void OnAccelerator(uint32_t id, const ui::Event& event) override {} | 65 void OnAccelerator(uint32_t id, const ui::Event& event) override {} |
| 64 | 66 |
| 65 private: | 67 private: |
| 66 DISALLOW_COPY_AND_ASSIGN(TestWindowManagerDelegate); | 68 DISALLOW_COPY_AND_ASSIGN(TestWindowManagerDelegate); |
| 67 }; | 69 }; |
| 68 | 70 |
| 69 class BoundsChangeObserver : public WindowObserver { | 71 class BoundsChangeObserver : public WindowObserver { |
| 70 public: | 72 public: |
| 71 explicit BoundsChangeObserver(Window* window) : window_(window) { | 73 explicit BoundsChangeObserver(Window* window) : window_(window) { |
| 72 window_->AddObserver(this); | 74 window_->AddObserver(this); |
| (...skipping 1087 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1160 ASSERT_TRUE(window_in_wm); | 1162 ASSERT_TRUE(window_in_wm); |
| 1161 | 1163 |
| 1162 // Change the bounds in the wm, and make sure the child sees it. | 1164 // Change the bounds in the wm, and make sure the child sees it. |
| 1163 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101)); | 1165 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101)); |
| 1164 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_client)); | 1166 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_client)); |
| 1165 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_client->bounds()); | 1167 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_client->bounds()); |
| 1166 } | 1168 } |
| 1167 | 1169 |
| 1168 } // namespace ws | 1170 } // namespace ws |
| 1169 } // namespace mus | 1171 } // namespace mus |
| OLD | NEW |