| 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_SHELL_H_ | 5 #ifndef MOJO_SHELL_SHELL_H_ |
| 6 #define MOJO_SHELL_SHELL_H_ | 6 #define MOJO_SHELL_SHELL_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 | 172 |
| 173 void CleanupRunner(NativeRunner* runner); | 173 void CleanupRunner(NativeRunner* runner); |
| 174 | 174 |
| 175 // Loader management. | 175 // Loader management. |
| 176 // Loaders are chosen in the order they are listed here. | 176 // Loaders are chosen in the order they are listed here. |
| 177 NameToLoaderMap name_to_loader_; | 177 NameToLoaderMap name_to_loader_; |
| 178 scoped_ptr<Loader> default_loader_; | 178 scoped_ptr<Loader> default_loader_; |
| 179 | 179 |
| 180 IdentityToInstanceMap identity_to_instance_; | 180 IdentityToInstanceMap identity_to_instance_; |
| 181 | 181 |
| 182 // Tracks the names of instances that are allowed to field connection requests |
| 183 // from all users. |
| 184 std::set<std::string> singletons_; |
| 185 |
| 182 IdentityToShellClientFactoryMap shell_client_factories_; | 186 IdentityToShellClientFactoryMap shell_client_factories_; |
| 183 // Counter used to assign ids to client factories. | 187 // Counter used to assign ids to client factories. |
| 184 uint32_t shell_client_factory_id_counter_; | 188 uint32_t shell_client_factory_id_counter_; |
| 185 | 189 |
| 186 InterfacePtrSet<mojom::InstanceListener> instance_listeners_; | 190 InterfacePtrSet<mojom::InstanceListener> instance_listeners_; |
| 187 | 191 |
| 188 base::Callback<void(const Identity&)> instance_quit_callback_; | 192 base::Callback<void(const Identity&)> instance_quit_callback_; |
| 189 scoped_ptr<NativeRunnerFactory> native_runner_factory_; | 193 scoped_ptr<NativeRunnerFactory> native_runner_factory_; |
| 190 std::vector<scoped_ptr<NativeRunner>> native_runners_; | 194 std::vector<scoped_ptr<NativeRunner>> native_runners_; |
| 191 scoped_ptr<ShellConnection> shell_connection_; | 195 scoped_ptr<ShellConnection> shell_connection_; |
| 192 base::WeakPtrFactory<Shell> weak_ptr_factory_; | 196 base::WeakPtrFactory<Shell> weak_ptr_factory_; |
| 193 | 197 |
| 194 DISALLOW_COPY_AND_ASSIGN(Shell); | 198 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 195 }; | 199 }; |
| 196 | 200 |
| 197 mojom::Connector::ConnectCallback EmptyConnectCallback(); | 201 mojom::Connector::ConnectCallback EmptyConnectCallback(); |
| 198 | 202 |
| 199 } // namespace shell | 203 } // namespace shell |
| 200 } // namespace mojo | 204 } // namespace mojo |
| 201 | 205 |
| 202 #endif // MOJO_SHELL_SHELL_H_ | 206 #endif // MOJO_SHELL_SHELL_H_ |
| OLD | NEW |