| 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_SERVICE_MANAGER_SERVICE_MANAGER_H_ | 5 #ifndef SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_H_ |
| 6 #define SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_H_ | 6 #define SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 mojo::InterfacePtrSet<mojom::ServiceManagerListener> listeners_; | 181 mojo::InterfacePtrSet<mojom::ServiceManagerListener> listeners_; |
| 182 base::Callback<void(const Identity&)> instance_quit_callback_; | 182 base::Callback<void(const Identity&)> instance_quit_callback_; |
| 183 std::unique_ptr<ServiceProcessLauncherFactory> | 183 std::unique_ptr<ServiceProcessLauncherFactory> |
| 184 service_process_launcher_factory_; | 184 service_process_launcher_factory_; |
| 185 std::unique_ptr<ServiceContext> service_context_; | 185 std::unique_ptr<ServiceContext> service_context_; |
| 186 base::WeakPtrFactory<ServiceManager> weak_ptr_factory_; | 186 base::WeakPtrFactory<ServiceManager> weak_ptr_factory_; |
| 187 | 187 |
| 188 DISALLOW_COPY_AND_ASSIGN(ServiceManager); | 188 DISALLOW_COPY_AND_ASSIGN(ServiceManager); |
| 189 }; | 189 }; |
| 190 | 190 |
| 191 mojom::Connector::ConnectCallback EmptyConnectCallback(); | |
| 192 | |
| 193 } // namespace service_manager | 191 } // namespace service_manager |
| 194 | 192 |
| 195 #endif // SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_H_ | 193 #endif // SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2804373002:
Eliminate Connector::Connect(), Connection, etc. (Closed)
