| 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 #ifndef MOJO_SHELL_APPLICATION_MANAGER_H_ | 5 #ifndef MOJO_SHELL_APPLICATION_MANAGER_H_ |
| 6 #define MOJO_SHELL_APPLICATION_MANAGER_H_ | 6 #define MOJO_SHELL_APPLICATION_MANAGER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 base::TaskRunner* file_task_runner_; | 187 base::TaskRunner* file_task_runner_; |
| 188 scoped_ptr<NativeRunnerFactory> native_runner_factory_; | 188 scoped_ptr<NativeRunnerFactory> native_runner_factory_; |
| 189 std::vector<scoped_ptr<NativeRunner>> native_runners_; | 189 std::vector<scoped_ptr<NativeRunner>> native_runners_; |
| 190 scoped_ptr<ShellConnection> shell_connection_; | 190 scoped_ptr<ShellConnection> shell_connection_; |
| 191 BindingSet<mojom::ApplicationManager> bindings_; | 191 BindingSet<mojom::ApplicationManager> bindings_; |
| 192 base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_; | 192 base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_; |
| 193 | 193 |
| 194 DISALLOW_COPY_AND_ASSIGN(ApplicationManager); | 194 DISALLOW_COPY_AND_ASSIGN(ApplicationManager); |
| 195 }; | 195 }; |
| 196 | 196 |
| 197 mojom::Shell::ConnectCallback EmptyConnectCallback(); | 197 mojom::Connector::ConnectCallback EmptyConnectCallback(); |
| 198 | 198 |
| 199 } // namespace shell | 199 } // namespace shell |
| 200 } // namespace mojo | 200 } // namespace mojo |
| 201 | 201 |
| 202 #endif // MOJO_SHELL_APPLICATION_MANAGER_H_ | 202 #endif // MOJO_SHELL_APPLICATION_MANAGER_H_ |
| OLD | NEW |