| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/chromeos/dbus/dbus_thread_manager.h" | 5 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/threading/thread.h" | 8 #include "base/threading/thread.h" |
| 9 #include "chrome/browser/chromeos/dbus/bluetooth_adapter_client.h" | 9 #include "chrome/browser/chromeos/dbus/bluetooth_adapter_client.h" |
| 10 #include "chrome/browser/chromeos/dbus/bluetooth_manager_client.h" | 10 #include "chrome/browser/chromeos/dbus/bluetooth_manager_client.h" |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 // DBusThreadManager override. | 97 // DBusThreadManager override. |
| 98 virtual SessionManagerClient* session_manager_client() OVERRIDE { | 98 virtual SessionManagerClient* session_manager_client() OVERRIDE { |
| 99 return session_manager_client_.get(); | 99 return session_manager_client_.get(); |
| 100 } | 100 } |
| 101 | 101 |
| 102 // DBusThreadManager override. | 102 // DBusThreadManager override. |
| 103 virtual SpeechSynthesizerClient* speech_synthesizer_client() OVERRIDE { | 103 virtual SpeechSynthesizerClient* speech_synthesizer_client() OVERRIDE { |
| 104 return speech_synthesizer_client_.get(); | 104 return speech_synthesizer_client_.get(); |
| 105 } | 105 } |
| 106 | 106 |
| 107 // DBusThreadManager override. | |
| 108 virtual void set_session_manager_client_for_testing( | |
| 109 SessionManagerClient* session_manager_client) OVERRIDE { | |
| 110 session_manager_client_.reset(session_manager_client); | |
| 111 } | |
| 112 | |
| 113 scoped_ptr<base::Thread> dbus_thread_; | 107 scoped_ptr<base::Thread> dbus_thread_; |
| 114 scoped_refptr<dbus::Bus> system_bus_; | 108 scoped_refptr<dbus::Bus> system_bus_; |
| 115 scoped_ptr<CrosDBusService> cros_dbus_service_; | 109 scoped_ptr<CrosDBusService> cros_dbus_service_; |
| 116 scoped_ptr<BluetoothAdapterClient> bluetooth_adapter_client_; | 110 scoped_ptr<BluetoothAdapterClient> bluetooth_adapter_client_; |
| 117 scoped_ptr<BluetoothManagerClient> bluetooth_manager_client_; | 111 scoped_ptr<BluetoothManagerClient> bluetooth_manager_client_; |
| 118 scoped_ptr<PowerManagerClient> power_manager_client_; | 112 scoped_ptr<PowerManagerClient> power_manager_client_; |
| 119 scoped_ptr<SensorsClient> sensors_client_; | 113 scoped_ptr<SensorsClient> sensors_client_; |
| 120 scoped_ptr<SessionManagerClient> session_manager_client_; | 114 scoped_ptr<SessionManagerClient> session_manager_client_; |
| 121 scoped_ptr<SpeechSynthesizerClient> speech_synthesizer_client_; | 115 scoped_ptr<SpeechSynthesizerClient> speech_synthesizer_client_; |
| 122 }; | 116 }; |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 } | 155 } |
| 162 | 156 |
| 163 // static | 157 // static |
| 164 DBusThreadManager* DBusThreadManager::Get() { | 158 DBusThreadManager* DBusThreadManager::Get() { |
| 165 CHECK(g_dbus_thread_manager) | 159 CHECK(g_dbus_thread_manager) |
| 166 << "DBusThreadManager::Get() called before Initialize()"; | 160 << "DBusThreadManager::Get() called before Initialize()"; |
| 167 return g_dbus_thread_manager; | 161 return g_dbus_thread_manager; |
| 168 } | 162 } |
| 169 | 163 |
| 170 } // namespace chromeos | 164 } // namespace chromeos |
| OLD | NEW |