| 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 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 671 // window ID. This is likely bad from a security perspective and should be | 671 // window ID. This is likely bad from a security perspective and should be |
| 672 // fixed. | 672 // fixed. |
| 673 EXPECT_EQ("OnEmbed", | 673 EXPECT_EQ("OnEmbed", |
| 674 SingleChangeToDescription(*client->tracker()->changes())); | 674 SingleChangeToDescription(*client->tracker()->changes())); |
| 675 if (client_id) | 675 if (client_id) |
| 676 *client_id = (*client->tracker()->changes())[0].client_id; | 676 *client_id = (*client->tracker()->changes())[0].client_id; |
| 677 return client; | 677 return client; |
| 678 } | 678 } |
| 679 | 679 |
| 680 // WindowServerServiceTestBase: | 680 // WindowServerServiceTestBase: |
| 681 void OnBindInterface(const service_manager::ServiceInfo& source_info, | 681 void OnBindInterface(const service_manager::BindSourceInfo& source_info, |
| 682 const std::string& interface_name, | 682 const std::string& interface_name, |
| 683 mojo::ScopedMessagePipeHandle interface_pipe) override { | 683 mojo::ScopedMessagePipeHandle interface_pipe) override { |
| 684 registry_.BindInterface(source_info.identity, interface_name, | 684 registry_.BindInterface(source_info.identity, interface_name, |
| 685 std::move(interface_pipe)); | 685 std::move(interface_pipe)); |
| 686 } | 686 } |
| 687 | 687 |
| 688 void SetUp() override { | 688 void SetUp() override { |
| 689 client_factory_ = base::MakeUnique<WindowTreeClientFactory>(); | 689 client_factory_ = base::MakeUnique<WindowTreeClientFactory>(); |
| 690 registry_.AddInterface(client_factory_.get()); | 690 registry_.AddInterface(client_factory_.get()); |
| 691 | 691 |
| (...skipping 1578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2270 | 2270 |
| 2271 // TODO(sky): make sure coverage of what was | 2271 // TODO(sky): make sure coverage of what was |
| 2272 // WindowManagerTest.SecondEmbedRoot_InitService and | 2272 // WindowManagerTest.SecondEmbedRoot_InitService and |
| 2273 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window | 2273 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window |
| 2274 // manager | 2274 // manager |
| 2275 // tests. | 2275 // tests. |
| 2276 | 2276 |
| 2277 } // namespace test | 2277 } // namespace test |
| 2278 } // namespace ws | 2278 } // namespace ws |
| 2279 } // namespace ui | 2279 } // namespace ui |
| OLD | NEW |