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

Side by Side Diff: chrome/browser/chromeos/bluetooth/bluetooth_adapter.cc

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 8 years, 8 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
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.h" 5 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h" 11 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
12 #include "chrome/browser/chromeos/dbus/bluetooth_adapter_client.h" 12 #include "chromeos/dbus/bluetooth_adapter_client.h"
13 #include "chrome/browser/chromeos/dbus/bluetooth_device_client.h" 13 #include "chromeos/dbus/bluetooth_device_client.h"
14 #include "chrome/browser/chromeos/dbus/bluetooth_manager_client.h" 14 #include "chromeos/dbus/bluetooth_manager_client.h"
15 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" 15 #include "chromeos/dbus/dbus_thread_manager.h"
16 #include "dbus/object_path.h" 16 #include "dbus/object_path.h"
17 17
18 namespace chromeos { 18 namespace chromeos {
19 19
20 BluetoothAdapter::BluetoothAdapter() : weak_ptr_factory_(this), 20 BluetoothAdapter::BluetoothAdapter() : weak_ptr_factory_(this),
21 track_default_(false), 21 track_default_(false),
22 powered_(false), 22 powered_(false),
23 discovering_(false) { 23 discovering_(false) {
24 DBusThreadManager::Get()->GetBluetoothManagerClient()-> 24 DBusThreadManager::Get()->GetBluetoothManagerClient()->
25 AddObserver(this); 25 AddObserver(this);
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 } 461 }
462 462
463 // static 463 // static
464 BluetoothAdapter* BluetoothAdapter::Create(const std::string& address) { 464 BluetoothAdapter* BluetoothAdapter::Create(const std::string& address) {
465 BluetoothAdapter* adapter = new BluetoothAdapter; 465 BluetoothAdapter* adapter = new BluetoothAdapter;
466 adapter->FindAdapter(address); 466 adapter->FindAdapter(address);
467 return adapter; 467 return adapter;
468 } 468 }
469 469
470 } // namespace chromeos 470 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/bluetooth/bluetooth_adapter.h ('k') | chrome/browser/chromeos/bluetooth/bluetooth_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698