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

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

Issue 10546010: Implement support for the OOB Pairing APIs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 6 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
« no previous file with comments | « chromeos/dbus/dbus_thread_manager.h ('k') | chromeos/dbus/mock_bluetooth_out_of_band_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/chromeos/chromeos_version.h" 7 #include "base/chromeos/chromeos_version.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/threading/thread.h" 9 #include "base/threading/thread.h"
10 #include "chromeos/chromeos_switches.h" 10 #include "chromeos/chromeos_switches.h"
11 #include "chromeos/dbus/bluetooth_adapter_client.h" 11 #include "chromeos/dbus/bluetooth_adapter_client.h"
12 #include "chromeos/dbus/bluetooth_device_client.h" 12 #include "chromeos/dbus/bluetooth_device_client.h"
13 #include "chromeos/dbus/bluetooth_input_client.h" 13 #include "chromeos/dbus/bluetooth_input_client.h"
14 #include "chromeos/dbus/bluetooth_manager_client.h" 14 #include "chromeos/dbus/bluetooth_manager_client.h"
15 #include "chromeos/dbus/bluetooth_node_client.h" 15 #include "chromeos/dbus/bluetooth_node_client.h"
16 #include "chromeos/dbus/bluetooth_out_of_band_client.h"
16 #include "chromeos/dbus/cashew_client.h" 17 #include "chromeos/dbus/cashew_client.h"
17 #include "chromeos/dbus/cros_disks_client.h" 18 #include "chromeos/dbus/cros_disks_client.h"
18 #include "chromeos/dbus/cryptohome_client.h" 19 #include "chromeos/dbus/cryptohome_client.h"
19 #include "chromeos/dbus/dbus_client_implementation_type.h" 20 #include "chromeos/dbus/dbus_client_implementation_type.h"
20 #include "chromeos/dbus/debug_daemon_client.h" 21 #include "chromeos/dbus/debug_daemon_client.h"
21 #include "chromeos/dbus/flimflam_device_client.h" 22 #include "chromeos/dbus/flimflam_device_client.h"
22 #include "chromeos/dbus/flimflam_ipconfig_client.h" 23 #include "chromeos/dbus/flimflam_ipconfig_client.h"
23 #include "chromeos/dbus/flimflam_manager_client.h" 24 #include "chromeos/dbus/flimflam_manager_client.h"
24 #include "chromeos/dbus/flimflam_network_client.h" 25 #include "chromeos/dbus/flimflam_network_client.h"
25 #include "chromeos/dbus/flimflam_profile_client.h" 26 #include "chromeos/dbus/flimflam_profile_client.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 bluetooth_manager_client_.reset(BluetoothManagerClient::Create( 71 bluetooth_manager_client_.reset(BluetoothManagerClient::Create(
71 client_type, system_bus_.get())); 72 client_type, system_bus_.get()));
72 bluetooth_adapter_client_.reset(BluetoothAdapterClient::Create( 73 bluetooth_adapter_client_.reset(BluetoothAdapterClient::Create(
73 client_type, system_bus_.get(), bluetooth_manager_client_.get())); 74 client_type, system_bus_.get(), bluetooth_manager_client_.get()));
74 bluetooth_device_client_.reset(BluetoothDeviceClient::Create( 75 bluetooth_device_client_.reset(BluetoothDeviceClient::Create(
75 client_type, system_bus_.get(), bluetooth_adapter_client_.get())); 76 client_type, system_bus_.get(), bluetooth_adapter_client_.get()));
76 bluetooth_input_client_.reset(BluetoothInputClient::Create( 77 bluetooth_input_client_.reset(BluetoothInputClient::Create(
77 client_type, system_bus_.get(), bluetooth_adapter_client_.get())); 78 client_type, system_bus_.get(), bluetooth_adapter_client_.get()));
78 bluetooth_node_client_.reset(BluetoothNodeClient::Create( 79 bluetooth_node_client_.reset(BluetoothNodeClient::Create(
79 client_type, system_bus_.get(), bluetooth_device_client_.get())); 80 client_type, system_bus_.get(), bluetooth_device_client_.get()));
81 bluetooth_out_of_band_client_.reset(BluetoothOutOfBandClient::Create(
82 client_type, system_bus_.get()));
80 // Create the Cashew client. 83 // Create the Cashew client.
81 cashew_client_.reset(CashewClient::Create(client_type, system_bus_.get())); 84 cashew_client_.reset(CashewClient::Create(client_type, system_bus_.get()));
82 // Create the cros-disks client. 85 // Create the cros-disks client.
83 cros_disks_client_.reset( 86 cros_disks_client_.reset(
84 CrosDisksClient::Create(client_type, system_bus_.get())); 87 CrosDisksClient::Create(client_type, system_bus_.get()));
85 // Create the Cryptohome client. 88 // Create the Cryptohome client.
86 cryptohome_client_.reset( 89 cryptohome_client_.reset(
87 CryptohomeClient::Create(client_type, system_bus_.get())); 90 CryptohomeClient::Create(client_type, system_bus_.get()));
88 // Create the debugdaemon client. 91 // Create the debugdaemon client.
89 debugdaemon_client_.reset( 92 debugdaemon_client_.reset(
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 virtual BluetoothManagerClient* GetBluetoothManagerClient() OVERRIDE { 204 virtual BluetoothManagerClient* GetBluetoothManagerClient() OVERRIDE {
202 return bluetooth_manager_client_.get(); 205 return bluetooth_manager_client_.get();
203 } 206 }
204 207
205 // DBusThreadManager override. 208 // DBusThreadManager override.
206 virtual BluetoothNodeClient* GetBluetoothNodeClient() OVERRIDE { 209 virtual BluetoothNodeClient* GetBluetoothNodeClient() OVERRIDE {
207 return bluetooth_node_client_.get(); 210 return bluetooth_node_client_.get();
208 } 211 }
209 212
210 // DBusThreadManager override. 213 // DBusThreadManager override.
214 virtual BluetoothOutOfBandClient* GetBluetoothOutOfBandClient() OVERRIDE {
215 return bluetooth_out_of_band_client_.get();
216 }
217
218 // DBusThreadManager override.
211 virtual CashewClient* GetCashewClient() OVERRIDE { 219 virtual CashewClient* GetCashewClient() OVERRIDE {
212 return cashew_client_.get(); 220 return cashew_client_.get();
213 } 221 }
214 222
215 // DBusThreadManager override. 223 // DBusThreadManager override.
216 virtual CrosDisksClient* GetCrosDisksClient() OVERRIDE { 224 virtual CrosDisksClient* GetCrosDisksClient() OVERRIDE {
217 return cros_disks_client_.get(); 225 return cros_disks_client_.get();
218 } 226 }
219 227
220 // DBusThreadManager override. 228 // DBusThreadManager override.
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 } 321 }
314 322
315 scoped_ptr<base::Thread> dbus_thread_; 323 scoped_ptr<base::Thread> dbus_thread_;
316 scoped_refptr<dbus::Bus> system_bus_; 324 scoped_refptr<dbus::Bus> system_bus_;
317 scoped_refptr<dbus::Bus> ibus_bus_; 325 scoped_refptr<dbus::Bus> ibus_bus_;
318 scoped_ptr<BluetoothAdapterClient> bluetooth_adapter_client_; 326 scoped_ptr<BluetoothAdapterClient> bluetooth_adapter_client_;
319 scoped_ptr<BluetoothDeviceClient> bluetooth_device_client_; 327 scoped_ptr<BluetoothDeviceClient> bluetooth_device_client_;
320 scoped_ptr<BluetoothInputClient> bluetooth_input_client_; 328 scoped_ptr<BluetoothInputClient> bluetooth_input_client_;
321 scoped_ptr<BluetoothManagerClient> bluetooth_manager_client_; 329 scoped_ptr<BluetoothManagerClient> bluetooth_manager_client_;
322 scoped_ptr<BluetoothNodeClient> bluetooth_node_client_; 330 scoped_ptr<BluetoothNodeClient> bluetooth_node_client_;
331 scoped_ptr<BluetoothOutOfBandClient> bluetooth_out_of_band_client_;
323 scoped_ptr<CashewClient> cashew_client_; 332 scoped_ptr<CashewClient> cashew_client_;
324 scoped_ptr<CrosDisksClient> cros_disks_client_; 333 scoped_ptr<CrosDisksClient> cros_disks_client_;
325 scoped_ptr<CryptohomeClient> cryptohome_client_; 334 scoped_ptr<CryptohomeClient> cryptohome_client_;
326 scoped_ptr<DebugDaemonClient> debugdaemon_client_; 335 scoped_ptr<DebugDaemonClient> debugdaemon_client_;
327 scoped_ptr<FlimflamDeviceClient> flimflam_device_client_; 336 scoped_ptr<FlimflamDeviceClient> flimflam_device_client_;
328 scoped_ptr<FlimflamIPConfigClient> flimflam_ipconfig_client_; 337 scoped_ptr<FlimflamIPConfigClient> flimflam_ipconfig_client_;
329 scoped_ptr<FlimflamManagerClient> flimflam_manager_client_; 338 scoped_ptr<FlimflamManagerClient> flimflam_manager_client_;
330 scoped_ptr<FlimflamNetworkClient> flimflam_network_client_; 339 scoped_ptr<FlimflamNetworkClient> flimflam_network_client_;
331 scoped_ptr<FlimflamProfileClient> flimflam_profile_client_; 340 scoped_ptr<FlimflamProfileClient> flimflam_profile_client_;
332 scoped_ptr<FlimflamServiceClient> flimflam_service_client_; 341 scoped_ptr<FlimflamServiceClient> flimflam_service_client_;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 } 410 }
402 411
403 // static 412 // static
404 DBusThreadManager* DBusThreadManager::Get() { 413 DBusThreadManager* DBusThreadManager::Get() {
405 CHECK(g_dbus_thread_manager) 414 CHECK(g_dbus_thread_manager)
406 << "DBusThreadManager::Get() called before Initialize()"; 415 << "DBusThreadManager::Get() called before Initialize()";
407 return g_dbus_thread_manager; 416 return g_dbus_thread_manager;
408 } 417 }
409 418
410 } // namespace chromeos 419 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/dbus_thread_manager.h ('k') | chromeos/dbus/mock_bluetooth_out_of_band_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698