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 <stdint.h> | 5 #include <stdint.h> |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 void WmSetProperty(uint32_t change_id, | 85 void WmSetProperty(uint32_t change_id, |
86 uint32_t window_id, | 86 uint32_t window_id, |
87 const mojo::String& name, | 87 const mojo::String& name, |
88 mojo::Array<uint8_t> value) override {} | 88 mojo::Array<uint8_t> value) override {} |
89 void WmCreateTopLevelWindow( | 89 void WmCreateTopLevelWindow( |
90 uint32_t change_id, | 90 uint32_t change_id, |
91 mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) override { | 91 mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) override { |
92 got_create_top_level_window_ = true; | 92 got_create_top_level_window_ = true; |
93 change_id_ = change_id; | 93 change_id_ = change_id; |
94 } | 94 } |
| 95 void OnAccelerator(uint32_t id, mojom::EventPtr event) override {} |
95 | 96 |
96 bool got_create_top_level_window_; | 97 bool got_create_top_level_window_; |
97 uint32_t change_id_; | 98 uint32_t change_id_; |
98 | 99 |
99 DISALLOW_COPY_AND_ASSIGN(TestWindowManager); | 100 DISALLOW_COPY_AND_ASSIGN(TestWindowManager); |
100 }; | 101 }; |
101 | 102 |
102 // ----------------------------------------------------------------------------- | 103 // ----------------------------------------------------------------------------- |
103 | 104 |
104 // WindowTreeClient implementation that logs all calls to a TestChangeTracker. | 105 // WindowTreeClient implementation that logs all calls to a TestChangeTracker. |
(...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
891 SingleChangeToDescription(*embed_connection->tracker()->changes())); | 892 SingleChangeToDescription(*embed_connection->tracker()->changes())); |
892 | 893 |
893 // Set the visibility from the child using the client assigned id. | 894 // Set the visibility from the child using the client assigned id. |
894 ASSERT_TRUE(window_tree_connection->SetWindowVisibility( | 895 ASSERT_TRUE(window_tree_connection->SetWindowVisibility( |
895 embed_window_id2_in_child, false)); | 896 embed_window_id2_in_child, false)); |
896 EXPECT_FALSE(embed_window->visible()); | 897 EXPECT_FALSE(embed_window->visible()); |
897 } | 898 } |
898 | 899 |
899 } // namespace ws | 900 } // namespace ws |
900 } // namespace mus | 901 } // namespace mus |
OLD | NEW |