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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 OnWmClientJankinessChanged(const std::set<Window*>& client_windows, | 60 void OnWmClientJankinessChanged(const std::set<Window*>& client_windows, |
61 bool janky) override {} | 61 bool janky) override {} |
62 void OnWmNewDisplay(Window* window, | 62 void OnWmNewDisplay(Window* window, |
63 const display::Display& display) override {} | 63 const display::Display& display) override {} |
64 void OnAccelerator(uint32_t id, const ui::Event& event) override {} | |
65 | 64 |
66 private: | 65 private: |
67 DISALLOW_COPY_AND_ASSIGN(TestWindowManagerDelegate); | 66 DISALLOW_COPY_AND_ASSIGN(TestWindowManagerDelegate); |
68 }; | 67 }; |
69 | 68 |
70 class BoundsChangeObserver : public WindowObserver { | 69 class BoundsChangeObserver : public WindowObserver { |
71 public: | 70 public: |
72 explicit BoundsChangeObserver(Window* window) : window_(window) { | 71 explicit BoundsChangeObserver(Window* window) : window_(window) { |
73 window_->AddObserver(this); | 72 window_->AddObserver(this); |
74 } | 73 } |
(...skipping 1086 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1161 ASSERT_TRUE(window_in_wm); | 1160 ASSERT_TRUE(window_in_wm); |
1162 | 1161 |
1163 // Change the bounds in the wm, and make sure the child sees it. | 1162 // Change the bounds in the wm, and make sure the child sees it. |
1164 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101)); | 1163 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101)); |
1165 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_client)); | 1164 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_client)); |
1166 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_client->bounds()); | 1165 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_client->bounds()); |
1167 } | 1166 } |
1168 | 1167 |
1169 } // namespace ws | 1168 } // namespace ws |
1170 } // namespace ui | 1169 } // namespace ui |
OLD | NEW |