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 #include "mojo/shell/dbus_service_loader_linux.h" | 5 #include "mojo/shell/dbus_service_loader_linux.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/task_runner_util.h" | 12 #include "base/task_runner_util.h" |
13 #include "base/threading/thread_restrictions.h" | 13 #include "base/threading/thread_restrictions.h" |
14 #include "dbus/bus.h" | 14 #include "dbus/bus.h" |
15 #include "dbus/file_descriptor.h" | 15 #include "dbus/file_descriptor.h" |
16 #include "dbus/message.h" | 16 #include "dbus/message.h" |
17 #include "dbus/object_path.h" | 17 #include "dbus/object_path.h" |
18 #include "dbus/object_proxy.h" | 18 #include "dbus/object_proxy.h" |
19 #include "mojo/common/channel_init.h" | |
20 #include "mojo/dbus/dbus_external_service.h" | 19 #include "mojo/dbus/dbus_external_service.h" |
| 20 #include "mojo/embedder/channel_init.h" |
21 #include "mojo/embedder/platform_channel_pair.h" | 21 #include "mojo/embedder/platform_channel_pair.h" |
22 #include "mojo/shell/context.h" | 22 #include "mojo/shell/context.h" |
23 #include "mojo/shell/external_service.mojom.h" | 23 #include "mojo/shell/external_service.mojom.h" |
24 #include "mojo/shell/keep_alive.h" | 24 #include "mojo/shell/keep_alive.h" |
25 | 25 |
26 namespace mojo { | 26 namespace mojo { |
27 namespace shell { | 27 namespace shell { |
28 | 28 |
29 // Manages the connection to a single externally-running service. | 29 // Manages the connection to a single externally-running service. |
30 class DBusServiceLoader::LoadContext { | 30 class DBusServiceLoader::LoadContext { |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 DCHECK(it != url_to_load_context_.end()) << url; | 172 DCHECK(it != url_to_load_context_.end()) << url; |
173 | 173 |
174 LoadContext* doomed = it->second; | 174 LoadContext* doomed = it->second; |
175 url_to_load_context_.erase(it); | 175 url_to_load_context_.erase(it); |
176 | 176 |
177 delete doomed; | 177 delete doomed; |
178 } | 178 } |
179 | 179 |
180 } // namespace shell | 180 } // namespace shell |
181 } // namespace mojo | 181 } // namespace mojo |
OLD | NEW |