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/macros.h" | 9 #include "base/macros.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
407 void WmCreateTopLevelWindow( | 407 void WmCreateTopLevelWindow( |
408 uint32_t change_id, | 408 uint32_t change_id, |
409 ClientSpecificId requesting_client_id, | 409 ClientSpecificId requesting_client_id, |
410 mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) override { | 410 mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) override { |
411 NOTIMPLEMENTED(); | 411 NOTIMPLEMENTED(); |
412 } | 412 } |
413 void WmClientJankinessChanged(ClientSpecificId client_id, | 413 void WmClientJankinessChanged(ClientSpecificId client_id, |
414 bool janky) override { | 414 bool janky) override { |
415 NOTIMPLEMENTED(); | 415 NOTIMPLEMENTED(); |
416 } | 416 } |
417 void OnAccelerator(uint32_t id, std::unique_ptr<ui::Event> event) override { | 417 void OnAccelerator(uint32_t ack_id, |
| 418 uint32_t accelerator_id, |
| 419 std::unique_ptr<ui::Event> event) override { |
418 NOTIMPLEMENTED(); | 420 NOTIMPLEMENTED(); |
419 } | 421 } |
420 | 422 |
421 TestChangeTracker tracker_; | 423 TestChangeTracker tracker_; |
422 | 424 |
423 mojom::WindowTreePtr tree_; | 425 mojom::WindowTreePtr tree_; |
424 | 426 |
425 // If non-null we're waiting for OnEmbed() using this RunLoop. | 427 // If non-null we're waiting for OnEmbed() using this RunLoop. |
426 std::unique_ptr<base::RunLoop> embed_run_loop_; | 428 std::unique_ptr<base::RunLoop> embed_run_loop_; |
427 | 429 |
(...skipping 1605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2033 | 2035 |
2034 // TODO(sky): make sure coverage of what was | 2036 // TODO(sky): make sure coverage of what was |
2035 // WindowManagerTest.SecondEmbedRoot_InitService and | 2037 // WindowManagerTest.SecondEmbedRoot_InitService and |
2036 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window | 2038 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window |
2037 // manager | 2039 // manager |
2038 // tests. | 2040 // tests. |
2039 | 2041 |
2040 } // namespace test | 2042 } // namespace test |
2041 } // namespace ws | 2043 } // namespace ws |
2042 } // namespace ui | 2044 } // namespace ui |
OLD | NEW |