OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/arc/arc_bridge_service_impl.h" | 5 #include "components/arc/arc_bridge_service_impl.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/json/json_writer.h" | 11 #include "base/json/json_writer.h" |
12 #include "base/prefs/pref_registry_simple.h" | |
13 #include "base/prefs/pref_service.h" | |
14 #include "base/sequenced_task_runner.h" | 12 #include "base/sequenced_task_runner.h" |
15 #include "base/sys_info.h" | 13 #include "base/sys_info.h" |
16 #include "base/task_runner_util.h" | 14 #include "base/task_runner_util.h" |
17 #include "base/thread_task_runner_handle.h" | 15 #include "base/thread_task_runner_handle.h" |
18 #include "chromeos/chromeos_switches.h" | 16 #include "chromeos/chromeos_switches.h" |
19 #include "chromeos/dbus/dbus_method_call_status.h" | 17 #include "chromeos/dbus/dbus_method_call_status.h" |
20 #include "chromeos/dbus/dbus_thread_manager.h" | 18 #include "chromeos/dbus/dbus_thread_manager.h" |
21 #include "chromeos/dbus/session_manager_client.h" | 19 #include "chromeos/dbus/session_manager_client.h" |
| 20 #include "components/prefs/pref_registry_simple.h" |
| 21 #include "components/prefs/pref_service.h" |
22 | 22 |
23 namespace arc { | 23 namespace arc { |
24 | 24 |
25 ArcBridgeServiceImpl::ArcBridgeServiceImpl( | 25 ArcBridgeServiceImpl::ArcBridgeServiceImpl( |
26 scoped_ptr<ArcBridgeBootstrap> bootstrap) | 26 scoped_ptr<ArcBridgeBootstrap> bootstrap) |
27 : bootstrap_(std::move(bootstrap)), | 27 : bootstrap_(std::move(bootstrap)), |
28 binding_(this), | 28 binding_(this), |
29 session_started_(false), | 29 session_started_(false), |
30 weak_factory_(this) { | 30 weak_factory_(this) { |
31 bootstrap_->set_delegate(this); | 31 bootstrap_->set_delegate(this); |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 // This will happen when the instance is shut down. Ignore that case. | 123 // This will happen when the instance is shut down. Ignore that case. |
124 return; | 124 return; |
125 } | 125 } |
126 VLOG(1) << "Mojo connection lost"; | 126 VLOG(1) << "Mojo connection lost"; |
127 CloseAllChannels(); | 127 CloseAllChannels(); |
128 reconnect_ = true; | 128 reconnect_ = true; |
129 StopInstance(); | 129 StopInstance(); |
130 } | 130 } |
131 | 131 |
132 } // namespace arc | 132 } // namespace arc |
OLD | NEW |