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

Side by Side Diff: device/bluetooth/bluetooth_adapter_chromeos.cc

Issue 11075006: Moved bluetooth adapter files to device/bluetooth/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix so that this CL compiles on Windows. Created 8 years, 2 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 "chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos.h" 5 #include "device/bluetooth/bluetooth_adapter_chromeos.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/stl_util.h" 11 #include "base/stl_util.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/chromeos/bluetooth/bluetooth_device_chromeos.h"
14 #include "chromeos/dbus/bluetooth_adapter_client.h" 13 #include "chromeos/dbus/bluetooth_adapter_client.h"
15 #include "chromeos/dbus/bluetooth_device_client.h" 14 #include "chromeos/dbus/bluetooth_device_client.h"
16 #include "chromeos/dbus/bluetooth_manager_client.h" 15 #include "chromeos/dbus/bluetooth_manager_client.h"
17 #include "chromeos/dbus/bluetooth_out_of_band_client.h" 16 #include "chromeos/dbus/bluetooth_out_of_band_client.h"
18 #include "chromeos/dbus/bluetooth_out_of_band_pairing_data.h"
19 #include "chromeos/dbus/dbus_thread_manager.h" 17 #include "chromeos/dbus/dbus_thread_manager.h"
20 #include "dbus/object_path.h" 18 #include "dbus/object_path.h"
19 #include "device/bluetooth/bluetooth_device_chromeos.h"
20 #include "device/bluetooth/bluetooth_out_of_band_pairing_data.h"
21 21
22 namespace chromeos { 22 using chromeos::BluetoothAdapterClient;
23 using chromeos::BluetoothDeviceClient;
24 using chromeos::DBusThreadManager;
25
26 namespace bluetooth {
keybuk 2012/10/12 00:13:18 should this be namespace bluetooth or namespace ch
youngki 2012/10/12 01:50:12 I changed bluetooth_adapter_chromeos, bluetooth_de
23 27
24 BluetoothAdapterChromeOs::BluetoothAdapterChromeOs() : track_default_(false), 28 BluetoothAdapterChromeOs::BluetoothAdapterChromeOs() : track_default_(false),
25 powered_(false), 29 powered_(false),
26 discovering_(false), 30 discovering_(false),
27 weak_ptr_factory_(this) { 31 weak_ptr_factory_(this) {
28 DBusThreadManager::Get()->GetBluetoothManagerClient()-> 32 DBusThreadManager::Get()->GetBluetoothManagerClient()->
29 AddObserver(this); 33 AddObserver(this);
30 DBusThreadManager::Get()->GetBluetoothAdapterClient()-> 34 DBusThreadManager::Get()->GetBluetoothAdapterClient()->
31 AddObserver(this); 35 AddObserver(this);
32 DBusThreadManager::Get()->GetBluetoothDeviceClient()-> 36 DBusThreadManager::Get()->GetBluetoothDeviceClient()->
(...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 } else { 529 } else {
526 DVLOG(1) << "Paired device " << device->address() 530 DVLOG(1) << "Paired device " << device->address()
527 << " is no longer visible to the adapter"; 531 << " is no longer visible to the adapter";
528 device->SetVisible(false); 532 device->SetVisible(false);
529 533
530 FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_, 534 FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
531 DeviceChanged(this, device)); 535 DeviceChanged(this, device));
532 } 536 }
533 } 537 }
534 538
535 } // namespace chromeos 539 } // namespace bluetooth
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698