| 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 SERVICES_SHELL_SHELL_H_ | 5 #ifndef SERVICES_SHELL_SHELL_H_ |
| 6 #define SERVICES_SHELL_SHELL_H_ | 6 #define SERVICES_SHELL_SHELL_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 | 143 |
| 144 base::WeakPtr<Shell> GetWeakPtr(); | 144 base::WeakPtr<Shell> GetWeakPtr(); |
| 145 | 145 |
| 146 std::map<Identity, Instance*> identity_to_instance_; | 146 std::map<Identity, Instance*> identity_to_instance_; |
| 147 | 147 |
| 148 // Tracks the names of instances that are allowed to field connection requests | 148 // Tracks the names of instances that are allowed to field connection requests |
| 149 // from all users. | 149 // from all users. |
| 150 std::set<std::string> singletons_; | 150 std::set<std::string> singletons_; |
| 151 | 151 |
| 152 std::map<Identity, mojom::ShellClientFactoryPtr> shell_client_factories_; | 152 std::map<Identity, mojom::ShellClientFactoryPtr> shell_client_factories_; |
| 153 // Counter used to assign ids to client factories. | |
| 154 uint32_t shell_client_factory_id_counter_; | |
| 155 | |
| 156 std::map<Identity, mojom::ShellResolverPtr> identity_to_resolver_; | 153 std::map<Identity, mojom::ShellResolverPtr> identity_to_resolver_; |
| 157 | |
| 158 mojo::InterfacePtrSet<mojom::InstanceListener> instance_listeners_; | 154 mojo::InterfacePtrSet<mojom::InstanceListener> instance_listeners_; |
| 159 | |
| 160 base::Callback<void(const Identity&)> instance_quit_callback_; | 155 base::Callback<void(const Identity&)> instance_quit_callback_; |
| 161 std::unique_ptr<NativeRunnerFactory> native_runner_factory_; | 156 std::unique_ptr<NativeRunnerFactory> native_runner_factory_; |
| 162 std::unique_ptr<ShellConnection> shell_connection_; | 157 std::unique_ptr<ShellConnection> shell_connection_; |
| 163 base::WeakPtrFactory<Shell> weak_ptr_factory_; | 158 base::WeakPtrFactory<Shell> weak_ptr_factory_; |
| 164 | 159 |
| 165 DISALLOW_COPY_AND_ASSIGN(Shell); | 160 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 166 }; | 161 }; |
| 167 | 162 |
| 168 mojom::Connector::ConnectCallback EmptyConnectCallback(); | 163 mojom::Connector::ConnectCallback EmptyConnectCallback(); |
| 169 | 164 |
| 170 } // namespace shell | 165 } // namespace shell |
| 171 | 166 |
| 172 #endif // SERVICES_SHELL_SHELL_H_ | 167 #endif // SERVICES_SHELL_SHELL_H_ |
| OLD | NEW |