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 <utility> | 5 #include <utility> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "mojo/public/cpp/bindings/binding.h" | 9 #include "mojo/public/cpp/bindings/binding.h" |
10 #include "mojo/public/cpp/environment/environment.h" | 10 #include "mojo/public/cpp/environment/environment.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 // shell::mojom::ShellClient implementation. | 44 // shell::mojom::ShellClient implementation. |
45 void Initialize(shell::mojom::ShellPtr shell, | 45 void Initialize(shell::mojom::ShellPtr shell, |
46 const mojo::String& url, | 46 const mojo::String& url, |
47 uint32_t id) override { | 47 uint32_t id) override { |
48 g_url = url; | 48 g_url = url; |
49 g_id = id; | 49 g_id = id; |
50 g_shell_client_request = binding_.Unbind(); | 50 g_shell_client_request = binding_.Unbind(); |
51 g_shell = std::move(shell); | 51 g_shell = std::move(shell); |
52 } | 52 } |
53 | 53 |
54 void AcceptConnection(const String& requestor_url, | 54 void AcceptConnection( |
55 uint32_t requestor_id, | 55 const String& requestor_url, |
56 InterfaceRequest<InterfaceProvider> local_interfaces, | 56 uint32_t requestor_id, |
57 InterfaceProviderPtr remote_interfaces, | 57 shell::mojom::InterfaceProviderRequest local_interfaces, |
58 Array<String> allowed_interfaces, | 58 shell::mojom::InterfaceProviderPtr remote_interfaces, |
59 const String& url) override { | 59 Array<String> allowed_interfaces, |
| 60 const String& url) override { |
60 MOJO_CHECK(false); | 61 MOJO_CHECK(false); |
61 } | 62 } |
62 | 63 |
63 void OnQuitRequested(const Callback<void(bool)>& callback) override { | 64 void OnQuitRequested(const Callback<void(bool)>& callback) override { |
64 MOJO_CHECK(false); | 65 MOJO_CHECK(false); |
65 } | 66 } |
66 | 67 |
67 Binding<ShellClient> binding_; | 68 Binding<ShellClient> binding_; |
68 }; | 69 }; |
69 | 70 |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
164 if (ShouldCreateDefaultRunLoop()) | 165 if (ShouldCreateDefaultRunLoop()) |
165 Environment::DestroyDefaultRunLoop(); | 166 Environment::DestroyDefaultRunLoop(); |
166 } | 167 } |
167 | 168 |
168 bool ApplicationTestBase::ShouldCreateDefaultRunLoop() { | 169 bool ApplicationTestBase::ShouldCreateDefaultRunLoop() { |
169 return true; | 170 return true; |
170 } | 171 } |
171 | 172 |
172 } // namespace test | 173 } // namespace test |
173 } // namespace mojo | 174 } // namespace mojo |
OLD | NEW |