| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "mojo/application/application_runner_chromium.h" | 9 #include "mojo/application/application_runner_chromium.h" |
| 10 #include "mojo/common/weak_binding_set.h" | 10 #include "mojo/common/weak_binding_set.h" |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 DCHECK(terminal); | 120 DCHECK(terminal); |
| 121 // The |TerminalEchoer| will own itself. | 121 // The |TerminalEchoer| will own itself. |
| 122 (new TerminalEchoer(terminal.Pass()))->StartReading(); | 122 (new TerminalEchoer(terminal.Pass()))->StartReading(); |
| 123 } | 123 } |
| 124 | 124 |
| 125 mojo::WeakBindingSet<mojo::terminal::TerminalClient> terminal_clients_; | 125 mojo::WeakBindingSet<mojo::terminal::TerminalClient> terminal_clients_; |
| 126 | 126 |
| 127 DISALLOW_COPY_AND_ASSIGN(EchoTerminalApp); | 127 DISALLOW_COPY_AND_ASSIGN(EchoTerminalApp); |
| 128 }; | 128 }; |
| 129 | 129 |
| 130 MojoResult MojoMain(MojoHandle shell_handle) { | 130 MojoResult MojoMain(MojoHandle application_request) { |
| 131 mojo::ApplicationRunnerChromium runner(new EchoTerminalApp()); | 131 mojo::ApplicationRunnerChromium runner(new EchoTerminalApp()); |
| 132 return runner.Run(shell_handle); | 132 return runner.Run(application_request); |
| 133 } | 133 } |
| OLD | NEW |