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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 } | 42 } |
43 bool OnWmSetProperty(Window* window, | 43 bool OnWmSetProperty(Window* window, |
44 const std::string& name, | 44 const std::string& name, |
45 scoped_ptr<std::vector<uint8_t>>* new_data) override { | 45 scoped_ptr<std::vector<uint8_t>>* new_data) override { |
46 return true; | 46 return true; |
47 } | 47 } |
48 Window* OnWmCreateTopLevelWindow( | 48 Window* OnWmCreateTopLevelWindow( |
49 std::map<std::string, std::vector<uint8_t>>* properties) override { | 49 std::map<std::string, std::vector<uint8_t>>* properties) override { |
50 return nullptr; | 50 return nullptr; |
51 } | 51 } |
52 void OnAccelerator(uint32_t id, mojom::EventPtr event) override {} | 52 void OnAccelerator(uint32_t id, const ui::Event& event) override {} |
53 | 53 |
54 private: | 54 private: |
55 DISALLOW_COPY_AND_ASSIGN(TestWindowManagerDelegate); | 55 DISALLOW_COPY_AND_ASSIGN(TestWindowManagerDelegate); |
56 }; | 56 }; |
57 | 57 |
58 class BoundsChangeObserver : public WindowObserver { | 58 class BoundsChangeObserver : public WindowObserver { |
59 public: | 59 public: |
60 explicit BoundsChangeObserver(Window* window) : window_(window) { | 60 explicit BoundsChangeObserver(Window* window) : window_(window) { |
61 window_->AddObserver(this); | 61 window_->AddObserver(this); |
62 } | 62 } |
(...skipping 1039 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1102 ASSERT_TRUE(window_in_wm); | 1102 ASSERT_TRUE(window_in_wm); |
1103 | 1103 |
1104 // Change the bounds in the wm, and make sure the child sees it. | 1104 // Change the bounds in the wm, and make sure the child sees it. |
1105 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101)); | 1105 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101)); |
1106 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_connection)); | 1106 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_connection)); |
1107 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_connection->bounds()); | 1107 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_connection->bounds()); |
1108 } | 1108 } |
1109 | 1109 |
1110 } // namespace ws | 1110 } // namespace ws |
1111 } // namespace mus | 1111 } // namespace mus |
OLD | NEW |