| 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/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| (...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 on_change_completed_result_ = success; | 425 on_change_completed_result_ = success; |
| 426 change_completed_run_loop_->Quit(); | 426 change_completed_run_loop_->Quit(); |
| 427 } | 427 } |
| 428 } | 428 } |
| 429 void RequestClose(uint32_t window_id) override {} | 429 void RequestClose(uint32_t window_id) override {} |
| 430 void GetWindowManager(mojo::AssociatedInterfaceRequest<mojom::WindowManager> | 430 void GetWindowManager(mojo::AssociatedInterfaceRequest<mojom::WindowManager> |
| 431 internal) override { | 431 internal) override { |
| 432 window_manager_binding_ = | 432 window_manager_binding_ = |
| 433 base::MakeUnique<mojo::AssociatedBinding<mojom::WindowManager>>( | 433 base::MakeUnique<mojo::AssociatedBinding<mojom::WindowManager>>( |
| 434 this, std::move(internal)); | 434 this, std::move(internal)); |
| 435 tree_->GetWindowManagerClient( | 435 tree_->GetWindowManagerClient(MakeRequest(&window_manager_client_)); |
| 436 MakeRequest(&window_manager_client_, tree_.associated_group())); | |
| 437 } | 436 } |
| 438 | 437 |
| 439 // mojom::WindowManager: | 438 // mojom::WindowManager: |
| 440 void OnConnect(uint16_t client_id) override {} | 439 void OnConnect(uint16_t client_id) override {} |
| 441 void WmNewDisplayAdded(const display::Display& display, | 440 void WmNewDisplayAdded(const display::Display& display, |
| 442 mojom::WindowDataPtr root_data, | 441 mojom::WindowDataPtr root_data, |
| 443 bool drawn) override { | 442 bool drawn) override { |
| 444 NOTIMPLEMENTED(); | 443 NOTIMPLEMENTED(); |
| 445 } | 444 } |
| 446 void WmDisplayRemoved(int64_t display_id) override { NOTIMPLEMENTED(); } | 445 void WmDisplayRemoved(int64_t display_id) override { NOTIMPLEMENTED(); } |
| (...skipping 1778 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2225 | 2224 |
| 2226 // TODO(sky): make sure coverage of what was | 2225 // TODO(sky): make sure coverage of what was |
| 2227 // WindowManagerTest.SecondEmbedRoot_InitService and | 2226 // WindowManagerTest.SecondEmbedRoot_InitService and |
| 2228 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window | 2227 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window |
| 2229 // manager | 2228 // manager |
| 2230 // tests. | 2229 // tests. |
| 2231 | 2230 |
| 2232 } // namespace test | 2231 } // namespace test |
| 2233 } // namespace ws | 2232 } // namespace ws |
| 2234 } // namespace ui | 2233 } // namespace ui |
| OLD | NEW |