| 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 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 469 DCHECK(!run_loop_); | 469 DCHECK(!run_loop_); |
| 470 run_loop_.reset(new base::RunLoop); | 470 run_loop_.reset(new base::RunLoop); |
| 471 run_loop_->Run(); | 471 run_loop_->Run(); |
| 472 run_loop_.reset(); | 472 run_loop_.reset(); |
| 473 } | 473 } |
| 474 return std::move(client_impl_); | 474 return std::move(client_impl_); |
| 475 } | 475 } |
| 476 | 476 |
| 477 private: | 477 private: |
| 478 // InterfaceFactory<WindowTreeClient>: | 478 // InterfaceFactory<WindowTreeClient>: |
| 479 void Create(Connection* connection, | 479 void Create(const shell::Identity& remote_identity, |
| 480 InterfaceRequest<WindowTreeClient> request) override { | 480 InterfaceRequest<WindowTreeClient> request) override { |
| 481 client_impl_.reset(new TestWindowTreeClient()); | 481 client_impl_.reset(new TestWindowTreeClient()); |
| 482 client_impl_->Bind(std::move(request)); | 482 client_impl_->Bind(std::move(request)); |
| 483 if (run_loop_.get()) | 483 if (run_loop_.get()) |
| 484 run_loop_->Quit(); | 484 run_loop_->Quit(); |
| 485 } | 485 } |
| 486 | 486 |
| 487 std::unique_ptr<TestWindowTreeClient> client_impl_; | 487 std::unique_ptr<TestWindowTreeClient> client_impl_; |
| 488 std::unique_ptr<base::RunLoop> run_loop_; | 488 std::unique_ptr<base::RunLoop> run_loop_; |
| 489 | 489 |
| (...skipping 1552 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2042 | 2042 |
| 2043 // TODO(sky): make sure coverage of what was | 2043 // TODO(sky): make sure coverage of what was |
| 2044 // WindowManagerTest.SecondEmbedRoot_InitService and | 2044 // WindowManagerTest.SecondEmbedRoot_InitService and |
| 2045 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window | 2045 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window |
| 2046 // manager | 2046 // manager |
| 2047 // tests. | 2047 // tests. |
| 2048 | 2048 |
| 2049 } // namespace test | 2049 } // namespace test |
| 2050 } // namespace ws | 2050 } // namespace ws |
| 2051 } // namespace ui | 2051 } // namespace ui |
| OLD | NEW |