Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(414)

Side by Side Diff: chromeos/dbus/dbus_thread_manager.cc

Issue 12564007: Hook up system clock update dbus signal to chrome and ash tray ui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix browser_tests by adding MockSystemClockClient. Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 <map> 7 #include <map>
8 8
9 #include "base/chromeos/chromeos_version.h" 9 #include "base/chromeos/chromeos_version.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/observer_list.h" 11 #include "base/observer_list.h"
12 #include "base/threading/thread.h" 12 #include "base/threading/thread.h"
13 #include "chromeos/chromeos_switches.h" 13 #include "chromeos/chromeos_switches.h"
14 #include "chromeos/dbus/bluetooth_adapter_client.h" 14 #include "chromeos/dbus/bluetooth_adapter_client.h"
15 #include "chromeos/dbus/bluetooth_device_client.h" 15 #include "chromeos/dbus/bluetooth_device_client.h"
16 #include "chromeos/dbus/bluetooth_input_client.h" 16 #include "chromeos/dbus/bluetooth_input_client.h"
17 #include "chromeos/dbus/bluetooth_manager_client.h" 17 #include "chromeos/dbus/bluetooth_manager_client.h"
18 #include "chromeos/dbus/bluetooth_node_client.h" 18 #include "chromeos/dbus/bluetooth_node_client.h"
19 #include "chromeos/dbus/bluetooth_out_of_band_client.h" 19 #include "chromeos/dbus/bluetooth_out_of_band_client.h"
20 #include "chromeos/dbus/cros_disks_client.h" 20 #include "chromeos/dbus/cros_disks_client.h"
21 #include "chromeos/dbus/cryptohome_client.h" 21 #include "chromeos/dbus/cryptohome_client.h"
22 #include "chromeos/dbus/dbus_client_implementation_type.h" 22 #include "chromeos/dbus/dbus_client_implementation_type.h"
23 #include "chromeos/dbus/dbus_thread_manager_observer.h" 23 #include "chromeos/dbus/dbus_thread_manager_observer.h"
24 #include "chromeos/dbus/debug_daemon_client.h" 24 #include "chromeos/dbus/debug_daemon_client.h"
25 #include "chromeos/dbus/gsm_sms_client.h"
25 #include "chromeos/dbus/shill_device_client.h" 26 #include "chromeos/dbus/shill_device_client.h"
26 #include "chromeos/dbus/shill_ipconfig_client.h" 27 #include "chromeos/dbus/shill_ipconfig_client.h"
27 #include "chromeos/dbus/shill_manager_client.h" 28 #include "chromeos/dbus/shill_manager_client.h"
28 #include "chromeos/dbus/shill_profile_client.h" 29 #include "chromeos/dbus/shill_profile_client.h"
29 #include "chromeos/dbus/shill_service_client.h" 30 #include "chromeos/dbus/shill_service_client.h"
30 #include "chromeos/dbus/gsm_sms_client.h" 31 #include "chromeos/dbus/system_clock_client.h"
31 #include "chromeos/dbus/ibus/ibus_client.h" 32 #include "chromeos/dbus/ibus/ibus_client.h"
32 #include "chromeos/dbus/ibus/ibus_config_client.h" 33 #include "chromeos/dbus/ibus/ibus_config_client.h"
33 #include "chromeos/dbus/ibus/ibus_engine_factory_service.h" 34 #include "chromeos/dbus/ibus/ibus_engine_factory_service.h"
34 #include "chromeos/dbus/ibus/ibus_engine_service.h" 35 #include "chromeos/dbus/ibus/ibus_engine_service.h"
35 #include "chromeos/dbus/ibus/ibus_input_context_client.h" 36 #include "chromeos/dbus/ibus/ibus_input_context_client.h"
36 #include "chromeos/dbus/ibus/ibus_panel_service.h" 37 #include "chromeos/dbus/ibus/ibus_panel_service.h"
37 #include "chromeos/dbus/image_burner_client.h" 38 #include "chromeos/dbus/image_burner_client.h"
38 #include "chromeos/dbus/introspectable_client.h" 39 #include "chromeos/dbus/introspectable_client.h"
39 #include "chromeos/dbus/modem_messaging_client.h" 40 #include "chromeos/dbus/modem_messaging_client.h"
40 #include "chromeos/dbus/permission_broker_client.h" 41 #include "chromeos/dbus/permission_broker_client.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 modem_messaging_client_.reset( 122 modem_messaging_client_.reset(
122 ModemMessagingClient::Create(client_type_, system_bus_.get())); 123 ModemMessagingClient::Create(client_type_, system_bus_.get()));
123 permission_broker_client_.reset( 124 permission_broker_client_.reset(
124 PermissionBrokerClient::Create(client_type_, system_bus_.get())); 125 PermissionBrokerClient::Create(client_type_, system_bus_.get()));
125 power_manager_client_.reset( 126 power_manager_client_.reset(
126 PowerManagerClient::Create(client_type_override_, system_bus_.get())); 127 PowerManagerClient::Create(client_type_override_, system_bus_.get()));
127 session_manager_client_.reset( 128 session_manager_client_.reset(
128 SessionManagerClient::Create(client_type_, system_bus_.get())); 129 SessionManagerClient::Create(client_type_, system_bus_.get()));
129 sms_client_.reset( 130 sms_client_.reset(
130 SMSClient::Create(client_type_, system_bus_.get())); 131 SMSClient::Create(client_type_, system_bus_.get()));
132 system_clock_client_.reset(
133 SystemClockClient::Create(client_type_, system_bus_.get()));
131 update_engine_client_.reset( 134 update_engine_client_.reset(
132 UpdateEngineClient::Create(client_type_, system_bus_.get())); 135 UpdateEngineClient::Create(client_type_, system_bus_.get()));
133 136
134 // PowerPolicyController is dependent on PowerManagerClient, so 137 // PowerPolicyController is dependent on PowerManagerClient, so
135 // initialize it after the main list of clients. 138 // initialize it after the main list of clients.
136 power_policy_controller_.reset( 139 power_policy_controller_.reset(
137 new PowerPolicyController(this, power_manager_client_.get())); 140 new PowerPolicyController(this, power_manager_client_.get()));
138 } 141 }
139 142
140 virtual ~DBusThreadManagerImpl() { 143 virtual ~DBusThreadManagerImpl() {
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 } 302 }
300 303
301 virtual SessionManagerClient* GetSessionManagerClient() OVERRIDE { 304 virtual SessionManagerClient* GetSessionManagerClient() OVERRIDE {
302 return session_manager_client_.get(); 305 return session_manager_client_.get();
303 } 306 }
304 307
305 virtual SMSClient* GetSMSClient() OVERRIDE { 308 virtual SMSClient* GetSMSClient() OVERRIDE {
306 return sms_client_.get(); 309 return sms_client_.get();
307 } 310 }
308 311
312 virtual SystemClockClient* GetSystemClockClient() OVERRIDE {
313 return system_clock_client_.get();
314 }
315
309 virtual UpdateEngineClient* GetUpdateEngineClient() OVERRIDE { 316 virtual UpdateEngineClient* GetUpdateEngineClient() OVERRIDE {
310 return update_engine_client_.get(); 317 return update_engine_client_.get();
311 } 318 }
312 319
313 virtual IBusClient* GetIBusClient() OVERRIDE { 320 virtual IBusClient* GetIBusClient() OVERRIDE {
314 return ibus_client_.get(); 321 return ibus_client_.get();
315 } 322 }
316 323
317 virtual IBusConfigClient* GetIBusConfigClient() OVERRIDE { 324 virtual IBusConfigClient* GetIBusConfigClient() OVERRIDE {
318 return ibus_config_client_.get(); 325 return ibus_config_client_.get();
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 scoped_ptr<ShillDeviceClient> shill_device_client_; 384 scoped_ptr<ShillDeviceClient> shill_device_client_;
378 scoped_ptr<ShillIPConfigClient> shill_ipconfig_client_; 385 scoped_ptr<ShillIPConfigClient> shill_ipconfig_client_;
379 scoped_ptr<ShillManagerClient> shill_manager_client_; 386 scoped_ptr<ShillManagerClient> shill_manager_client_;
380 scoped_ptr<ShillProfileClient> shill_profile_client_; 387 scoped_ptr<ShillProfileClient> shill_profile_client_;
381 scoped_ptr<ShillServiceClient> shill_service_client_; 388 scoped_ptr<ShillServiceClient> shill_service_client_;
382 scoped_ptr<GsmSMSClient> gsm_sms_client_; 389 scoped_ptr<GsmSMSClient> gsm_sms_client_;
383 scoped_ptr<ImageBurnerClient> image_burner_client_; 390 scoped_ptr<ImageBurnerClient> image_burner_client_;
384 scoped_ptr<IntrospectableClient> introspectable_client_; 391 scoped_ptr<IntrospectableClient> introspectable_client_;
385 scoped_ptr<ModemMessagingClient> modem_messaging_client_; 392 scoped_ptr<ModemMessagingClient> modem_messaging_client_;
386 scoped_ptr<PermissionBrokerClient> permission_broker_client_; 393 scoped_ptr<PermissionBrokerClient> permission_broker_client_;
394 scoped_ptr<SystemClockClient> system_clock_client_;
387 scoped_ptr<PowerManagerClient> power_manager_client_; 395 scoped_ptr<PowerManagerClient> power_manager_client_;
388 scoped_ptr<SessionManagerClient> session_manager_client_; 396 scoped_ptr<SessionManagerClient> session_manager_client_;
389 scoped_ptr<SMSClient> sms_client_; 397 scoped_ptr<SMSClient> sms_client_;
390 scoped_ptr<UpdateEngineClient> update_engine_client_; 398 scoped_ptr<UpdateEngineClient> update_engine_client_;
391 scoped_ptr<IBusClient> ibus_client_; 399 scoped_ptr<IBusClient> ibus_client_;
392 scoped_ptr<IBusConfigClient> ibus_config_client_; 400 scoped_ptr<IBusConfigClient> ibus_config_client_;
393 scoped_ptr<IBusInputContextClient> ibus_input_context_client_; 401 scoped_ptr<IBusInputContextClient> ibus_input_context_client_;
394 scoped_ptr<IBusEngineFactoryService> ibus_engine_factory_service_; 402 scoped_ptr<IBusEngineFactoryService> ibus_engine_factory_service_;
395 std::map<dbus::ObjectPath, IBusEngineService*> ibus_engine_services_; 403 std::map<dbus::ObjectPath, IBusEngineService*> ibus_engine_services_;
396 scoped_ptr<IBusPanelService> ibus_panel_service_; 404 scoped_ptr<IBusPanelService> ibus_panel_service_;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 } 478 }
471 479
472 // static 480 // static
473 DBusThreadManager* DBusThreadManager::Get() { 481 DBusThreadManager* DBusThreadManager::Get() {
474 CHECK(g_dbus_thread_manager) 482 CHECK(g_dbus_thread_manager)
475 << "DBusThreadManager::Get() called before Initialize()"; 483 << "DBusThreadManager::Get() called before Initialize()";
476 return g_dbus_thread_manager; 484 return g_dbus_thread_manager;
477 } 485 }
478 486
479 } // namespace chromeos 487 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698