| 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 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 362 mojom::Cursor cursor_id) override { | 362 mojom::Cursor cursor_id) override { |
| 363 tracker_.OnWindowPredefinedCursorChanged(window_id, cursor_id); | 363 tracker_.OnWindowPredefinedCursorChanged(window_id, cursor_id); |
| 364 } | 364 } |
| 365 void OnChangeCompleted(uint32_t change_id, bool success) override { | 365 void OnChangeCompleted(uint32_t change_id, bool success) override { |
| 366 if (waiting_change_id_ == change_id && change_completed_run_loop_) { | 366 if (waiting_change_id_ == change_id && change_completed_run_loop_) { |
| 367 on_change_completed_result_ = success; | 367 on_change_completed_result_ = success; |
| 368 change_completed_run_loop_->Quit(); | 368 change_completed_run_loop_->Quit(); |
| 369 } | 369 } |
| 370 } | 370 } |
| 371 void RequestClose(uint32_t window_id) override {} | 371 void RequestClose(uint32_t window_id) override {} |
| 372 void GetWindowManagerInternal( | 372 void GetWindowManager(mojo::AssociatedInterfaceRequest<mojom::WindowManager> |
| 373 mojo::AssociatedInterfaceRequest<mojom::WindowManagerInternal> internal) | 373 internal) override {} |
| 374 override {} | |
| 375 | 374 |
| 376 TestChangeTracker tracker_; | 375 TestChangeTracker tracker_; |
| 377 | 376 |
| 378 mojom::WindowTreePtr tree_; | 377 mojom::WindowTreePtr tree_; |
| 379 | 378 |
| 380 // If non-null we're waiting for OnEmbed() using this RunLoop. | 379 // If non-null we're waiting for OnEmbed() using this RunLoop. |
| 381 scoped_ptr<base::RunLoop> embed_run_loop_; | 380 scoped_ptr<base::RunLoop> embed_run_loop_; |
| 382 | 381 |
| 383 // If non-null we're waiting for a certain number of change notifications to | 382 // If non-null we're waiting for a certain number of change notifications to |
| 384 // be encountered. | 383 // be encountered. |
| (...skipping 1454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1839 // originating connection. | 1838 // originating connection. |
| 1840 | 1839 |
| 1841 // TODO(sky): make sure coverage of what was | 1840 // TODO(sky): make sure coverage of what was |
| 1842 // WindowManagerTest.SecondEmbedRoot_InitService and | 1841 // WindowManagerTest.SecondEmbedRoot_InitService and |
| 1843 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window | 1842 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window |
| 1844 // manager | 1843 // manager |
| 1845 // tests. | 1844 // tests. |
| 1846 | 1845 |
| 1847 } // namespace ws | 1846 } // namespace ws |
| 1848 } // namespace mus | 1847 } // namespace mus |
| OLD | NEW |