| OLD | NEW | 
|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "base/bind.h" | 5 #include "base/bind.h" | 
| 6 #include "base/guid.h" | 6 #include "base/guid.h" | 
| 7 #include "base/macros.h" | 7 #include "base/macros.h" | 
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" | 
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" | 
| 10 #include "mojo/public/c/system/main.h" | 10 #include "mojo/public/c/system/main.h" | 
| 11 #include "mojo/public/cpp/bindings/binding_set.h" | 11 #include "mojo/public/cpp/bindings/binding_set.h" | 
| 12 #include "mojo/shell/public/cpp/application_runner.h" | 12 #include "services/shell/public/cpp/application_runner.h" | 
| 13 #include "mojo/shell/public/cpp/connector.h" | 13 #include "services/shell/public/cpp/connector.h" | 
| 14 #include "mojo/shell/public/cpp/interface_factory.h" | 14 #include "services/shell/public/cpp/interface_factory.h" | 
| 15 #include "mojo/shell/public/cpp/shell_client.h" | 15 #include "services/shell/public/cpp/shell_client.h" | 
| 16 #include "mojo/shell/public/interfaces/connector.mojom.h" | 16 #include "services/shell/public/interfaces/connector.mojom.h" | 
| 17 #include "mojo/shell/tests/connect/connect_test.mojom.h" | 17 #include "services/shell/tests/connect/connect_test.mojom.h" | 
| 18 | 18 | 
| 19 namespace mojo { | 19 namespace mojo { | 
| 20 namespace shell { | 20 namespace shell { | 
| 21 namespace { | 21 namespace { | 
| 22 void QuitLoop(base::RunLoop* loop) { | 22 void QuitLoop(base::RunLoop* loop) { | 
| 23   loop->Quit(); | 23   loop->Quit(); | 
| 24 } | 24 } | 
| 25 | 25 | 
| 26 void ReceiveString(std::string* string, base::RunLoop* loop, | 26 void ReceiveString(std::string* string, base::RunLoop* loop, | 
| 27                    const std::string& response) { | 27                    const std::string& response) { | 
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 217 | 217 | 
| 218 }  // namespace shell | 218 }  // namespace shell | 
| 219 }  // namespace mojo | 219 }  // namespace mojo | 
| 220 | 220 | 
| 221 | 221 | 
| 222 MojoResult MojoMain(MojoHandle shell_handle) { | 222 MojoResult MojoMain(MojoHandle shell_handle) { | 
| 223   MojoResult rv = mojo::ApplicationRunner( | 223   MojoResult rv = mojo::ApplicationRunner( | 
| 224       new mojo::shell::ConnectTestApp).Run(shell_handle); | 224       new mojo::shell::ConnectTestApp).Run(shell_handle); | 
| 225   return rv; | 225   return rv; | 
| 226 } | 226 } | 
| OLD | NEW | 
|---|