OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chromeos/dbus/dbus_thread_manager.h" | 5 #include "chromeos/dbus/dbus_thread_manager.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
(...skipping 23 matching lines...) Expand all Loading... |
34 #include "chromeos/dbus/session_manager_client.h" | 34 #include "chromeos/dbus/session_manager_client.h" |
35 #include "chromeos/dbus/shill_device_client.h" | 35 #include "chromeos/dbus/shill_device_client.h" |
36 #include "chromeos/dbus/shill_ipconfig_client.h" | 36 #include "chromeos/dbus/shill_ipconfig_client.h" |
37 #include "chromeos/dbus/shill_manager_client.h" | 37 #include "chromeos/dbus/shill_manager_client.h" |
38 #include "chromeos/dbus/shill_profile_client.h" | 38 #include "chromeos/dbus/shill_profile_client.h" |
39 #include "chromeos/dbus/shill_service_client.h" | 39 #include "chromeos/dbus/shill_service_client.h" |
40 #include "chromeos/dbus/shill_third_party_vpn_driver_client.h" | 40 #include "chromeos/dbus/shill_third_party_vpn_driver_client.h" |
41 #include "chromeos/dbus/sms_client.h" | 41 #include "chromeos/dbus/sms_client.h" |
42 #include "chromeos/dbus/system_clock_client.h" | 42 #include "chromeos/dbus/system_clock_client.h" |
43 #include "chromeos/dbus/update_engine_client.h" | 43 #include "chromeos/dbus/update_engine_client.h" |
| 44 #include "chromeos/dbus/upstart_client.h" |
44 #include "dbus/bus.h" | 45 #include "dbus/bus.h" |
45 #include "dbus/dbus_statistics.h" | 46 #include "dbus/dbus_statistics.h" |
46 | 47 |
47 namespace chromeos { | 48 namespace chromeos { |
48 | 49 |
49 static DBusThreadManager* g_dbus_thread_manager = nullptr; | 50 static DBusThreadManager* g_dbus_thread_manager = nullptr; |
50 static bool g_using_dbus_thread_manager_for_testing = false; | 51 static bool g_using_dbus_thread_manager_for_testing = false; |
51 | 52 |
52 DBusThreadManager::DBusThreadManager(ProcessMask process_mask, | 53 DBusThreadManager::DBusThreadManager(ProcessMask process_mask, |
53 bool use_real_clients) | 54 bool use_real_clients) |
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
409 DBusThreadManager::Get()->clients_common_->session_manager_client_ = | 410 DBusThreadManager::Get()->clients_common_->session_manager_client_ = |
410 std::move(client); | 411 std::move(client); |
411 } | 412 } |
412 | 413 |
413 void DBusThreadManagerSetter::SetUpdateEngineClient( | 414 void DBusThreadManagerSetter::SetUpdateEngineClient( |
414 std::unique_ptr<UpdateEngineClient> client) { | 415 std::unique_ptr<UpdateEngineClient> client) { |
415 DBusThreadManager::Get()->clients_common_->update_engine_client_ = | 416 DBusThreadManager::Get()->clients_common_->update_engine_client_ = |
416 std::move(client); | 417 std::move(client); |
417 } | 418 } |
418 | 419 |
| 420 void DBusThreadManagerSetter::SetUpstartClient( |
| 421 std::unique_ptr<UpstartClient> client) { |
| 422 DBusThreadManager::Get()->clients_browser_->upstart_client_ = |
| 423 std::move(client); |
| 424 } |
| 425 |
419 } // namespace chromeos | 426 } // namespace chromeos |
OLD | NEW |