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 <map> | 7 #include <map> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/observer_list.h" | 10 #include "base/observer_list.h" |
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
502 CHECK(this == g_dbus_thread_manager); | 502 CHECK(this == g_dbus_thread_manager); |
503 if (g_dbus_thread_manager_for_testing) { | 503 if (g_dbus_thread_manager_for_testing) { |
504 g_dbus_thread_manager = NULL; | 504 g_dbus_thread_manager = NULL; |
505 g_dbus_thread_manager_for_testing = NULL; | 505 g_dbus_thread_manager_for_testing = NULL; |
506 VLOG(1) << "DBusThreadManager destroyed"; | 506 VLOG(1) << "DBusThreadManager destroyed"; |
507 } else { | 507 } else { |
508 LOG(FATAL) << "~DBusThreadManager() called outside of Shutdown()"; | 508 LOG(FATAL) << "~DBusThreadManager() called outside of Shutdown()"; |
509 } | 509 } |
510 } | 510 } |
511 | 511 |
| 512 int DBusThreadManager::GetPowerCycleDelay() const { |
| 513 return 0; |
| 514 } |
| 515 |
| 516 int DBusThreadManager::GetShillInteractiveDelay() const { |
| 517 return 0; |
| 518 } |
| 519 |
| 520 std::string DBusThreadManager::GetShillInitialState( |
| 521 const std::string& type) const { |
| 522 return ""; |
| 523 } |
| 524 |
512 // static | 525 // static |
513 DBusThreadManager* DBusThreadManager::Get() { | 526 DBusThreadManager* DBusThreadManager::Get() { |
514 CHECK(g_dbus_thread_manager) | 527 CHECK(g_dbus_thread_manager) |
515 << "DBusThreadManager::Get() called before Initialize()"; | 528 << "DBusThreadManager::Get() called before Initialize()"; |
516 return g_dbus_thread_manager; | 529 return g_dbus_thread_manager; |
517 } | 530 } |
518 | 531 |
519 // static | 532 // static |
520 void DBusThreadManager::InitializeClients() { | 533 void DBusThreadManager::InitializeClients() { |
521 InitClient(g_dbus_thread_manager->GetBluetoothAdapterClient()); | 534 InitClient(g_dbus_thread_manager->GetBluetoothAdapterClient()); |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
565 g_dbus_thread_manager->GetSystemBus()->GetManagedObjects(); | 578 g_dbus_thread_manager->GetSystemBus()->GetManagedObjects(); |
566 } | 579 } |
567 | 580 |
568 // static | 581 // static |
569 void DBusThreadManager::InitClient(DBusClient* client) { | 582 void DBusThreadManager::InitClient(DBusClient* client) { |
570 if (client) | 583 if (client) |
571 client->Init(g_dbus_thread_manager->GetSystemBus()); | 584 client->Init(g_dbus_thread_manager->GetSystemBus()); |
572 } | 585 } |
573 | 586 |
574 } // namespace chromeos | 587 } // namespace chromeos |
OLD | NEW |