| 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 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 390 uint32_t window_id, | 390 uint32_t window_id, |
| 391 const mojo::String& name, | 391 const mojo::String& name, |
| 392 mojo::Array<uint8_t> value) override { | 392 mojo::Array<uint8_t> value) override { |
| 393 window_manager_client_->WmResponse(change_id, false); | 393 window_manager_client_->WmResponse(change_id, false); |
| 394 } | 394 } |
| 395 void WmCreateTopLevelWindow( | 395 void WmCreateTopLevelWindow( |
| 396 uint32_t change_id, | 396 uint32_t change_id, |
| 397 mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) override { | 397 mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) override { |
| 398 NOTIMPLEMENTED(); | 398 NOTIMPLEMENTED(); |
| 399 } | 399 } |
| 400 void OnAccelerator(uint32_t id, mojom::EventPtr event) override { |
| 401 NOTIMPLEMENTED(); |
| 402 } |
| 400 | 403 |
| 401 TestChangeTracker tracker_; | 404 TestChangeTracker tracker_; |
| 402 | 405 |
| 403 mojom::WindowTreePtr tree_; | 406 mojom::WindowTreePtr tree_; |
| 404 | 407 |
| 405 // If non-null we're waiting for OnEmbed() using this RunLoop. | 408 // If non-null we're waiting for OnEmbed() using this RunLoop. |
| 406 scoped_ptr<base::RunLoop> embed_run_loop_; | 409 scoped_ptr<base::RunLoop> embed_run_loop_; |
| 407 | 410 |
| 408 // If non-null we're waiting for a certain number of change notifications to | 411 // If non-null we're waiting for a certain number of change notifications to |
| 409 // be encountered. | 412 // be encountered. |
| (...skipping 1458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1868 // originating connection. | 1871 // originating connection. |
| 1869 | 1872 |
| 1870 // TODO(sky): make sure coverage of what was | 1873 // TODO(sky): make sure coverage of what was |
| 1871 // WindowManagerTest.SecondEmbedRoot_InitService and | 1874 // WindowManagerTest.SecondEmbedRoot_InitService and |
| 1872 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window | 1875 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window |
| 1873 // manager | 1876 // manager |
| 1874 // tests. | 1877 // tests. |
| 1875 | 1878 |
| 1876 } // namespace ws | 1879 } // namespace ws |
| 1877 } // namespace mus | 1880 } // namespace mus |
| OLD | NEW |