| 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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 void OnWindowPredefinedCursorChanged(uint32_t window_id, | 367 void OnWindowPredefinedCursorChanged(uint32_t window_id, |
| 368 mojom::Cursor cursor_id) override { | 368 mojom::Cursor cursor_id) override { |
| 369 tracker_.OnWindowPredefinedCursorChanged(window_id, cursor_id); | 369 tracker_.OnWindowPredefinedCursorChanged(window_id, cursor_id); |
| 370 } | 370 } |
| 371 void OnChangeCompleted(uint32_t change_id, bool success) override { | 371 void OnChangeCompleted(uint32_t change_id, bool success) override { |
| 372 if (waiting_change_id_ == change_id && change_completed_run_loop_) { | 372 if (waiting_change_id_ == change_id && change_completed_run_loop_) { |
| 373 on_change_completed_result_ = success; | 373 on_change_completed_result_ = success; |
| 374 change_completed_run_loop_->Quit(); | 374 change_completed_run_loop_->Quit(); |
| 375 } | 375 } |
| 376 } | 376 } |
| 377 void OnMoveLoopCompleted(uint32_t change_id, bool success) override {} |
| 377 void RequestClose(uint32_t window_id) override {} | 378 void RequestClose(uint32_t window_id) override {} |
| 378 void GetWindowManager(mojo::AssociatedInterfaceRequest<mojom::WindowManager> | 379 void GetWindowManager(mojo::AssociatedInterfaceRequest<mojom::WindowManager> |
| 379 internal) override { | 380 internal) override { |
| 380 window_manager_binding_.reset( | 381 window_manager_binding_.reset( |
| 381 new mojo::AssociatedBinding<mojom::WindowManager>(this, | 382 new mojo::AssociatedBinding<mojom::WindowManager>(this, |
| 382 std::move(internal))); | 383 std::move(internal))); |
| 383 tree_->GetWindowManagerClient( | 384 tree_->GetWindowManagerClient( |
| 384 GetProxy(&window_manager_client_, tree_.associated_group())); | 385 GetProxy(&window_manager_client_, tree_.associated_group())); |
| 385 } | 386 } |
| 386 | 387 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 405 void WmCreateTopLevelWindow( | 406 void WmCreateTopLevelWindow( |
| 406 uint32_t change_id, | 407 uint32_t change_id, |
| 407 ClientSpecificId requesting_client_id, | 408 ClientSpecificId requesting_client_id, |
| 408 mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) override { | 409 mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) override { |
| 409 NOTIMPLEMENTED(); | 410 NOTIMPLEMENTED(); |
| 410 } | 411 } |
| 411 void WmClientJankinessChanged(ClientSpecificId client_id, | 412 void WmClientJankinessChanged(ClientSpecificId client_id, |
| 412 bool janky) override { | 413 bool janky) override { |
| 413 NOTIMPLEMENTED(); | 414 NOTIMPLEMENTED(); |
| 414 } | 415 } |
| 416 void WmPerformMoveLoop(uint32_t change_id, |
| 417 uint32_t window_id, |
| 418 const gfx::Point& cursor_location) override { |
| 419 NOTIMPLEMENTED(); |
| 420 } |
| 421 void WmCancelMoveLoop(uint32_t window_id) override { NOTIMPLEMENTED(); } |
| 415 void OnAccelerator(uint32_t id, std::unique_ptr<ui::Event> event) override { | 422 void OnAccelerator(uint32_t id, std::unique_ptr<ui::Event> event) override { |
| 416 NOTIMPLEMENTED(); | 423 NOTIMPLEMENTED(); |
| 417 } | 424 } |
| 418 | 425 |
| 419 TestChangeTracker tracker_; | 426 TestChangeTracker tracker_; |
| 420 | 427 |
| 421 mojom::WindowTreePtr tree_; | 428 mojom::WindowTreePtr tree_; |
| 422 | 429 |
| 423 // If non-null we're waiting for OnEmbed() using this RunLoop. | 430 // If non-null we're waiting for OnEmbed() using this RunLoop. |
| 424 std::unique_ptr<base::RunLoop> embed_run_loop_; | 431 std::unique_ptr<base::RunLoop> embed_run_loop_; |
| (...skipping 1606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2031 | 2038 |
| 2032 // TODO(sky): make sure coverage of what was | 2039 // TODO(sky): make sure coverage of what was |
| 2033 // WindowManagerTest.SecondEmbedRoot_InitService and | 2040 // WindowManagerTest.SecondEmbedRoot_InitService and |
| 2034 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window | 2041 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window |
| 2035 // manager | 2042 // manager |
| 2036 // tests. | 2043 // tests. |
| 2037 | 2044 |
| 2038 } // namespace test | 2045 } // namespace test |
| 2039 } // namespace ws | 2046 } // namespace ws |
| 2040 } // namespace mus | 2047 } // namespace mus |
| OLD | NEW |