chrome/browser/chromeos/bluetooth/bluetooth_device.cc - Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus

Side by Side Diff: chrome/browser/chromeos/bluetooth/bluetooth_device.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

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 "chrome/browser/chromeos/bluetooth/bluetooth_device.h"	5 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"

6	6

7 #include <string>	7 #include <string>

8 #include <vector>	8 #include <vector>

9	9

10 #include "base/bind.h"	10 #include "base/bind.h"

11 #include "base/logging.h"	11 #include "base/logging.h"

12 #include "base/string16.h"	12 #include "base/string16.h"

13 #include "base/string_util.h"	13 #include "base/string_util.h"

14 #include "base/utf_string_conversions.h"	14 #include "base/utf_string_conversions.h"

15 #include "base/values.h"	15 #include "base/values.h"

16 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"	16 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"

17 #include "chrome/browser/chromeos/dbus/bluetooth_adapter_client.h"

18 #include "chrome/browser/chromeos/dbus/bluetooth_agent_service_provider.h"

19 #include "chrome/browser/chromeos/dbus/bluetooth_device_client.h"

20 #include "chrome/browser/chromeos/dbus/bluetooth_input_client.h"

21 #include "chrome/browser/chromeos/dbus/introspectable_client.h"

22 #include "chrome/browser/chromeos/dbus/introspect_util.h"	17 #include "chrome/browser/chromeos/dbus/introspect_util.h"

23 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"	18 #include "chromeos/dbus/bluetooth_adapter_client.h"

	19 #include "chromeos/dbus/bluetooth_agent_service_provider.h"

	20 #include "chromeos/dbus/bluetooth_device_client.h"

	21 #include "chromeos/dbus/bluetooth_input_client.h"

	22 #include "chromeos/dbus/dbus_thread_manager.h"

	23 #include "chromeos/dbus/introspectable_client.h"

24 #include "dbus/bus.h"	24 #include "dbus/bus.h"

25 #include "dbus/object_path.h"	25 #include "dbus/object_path.h"

26 #include "grit/generated_resources.h"	26 #include "grit/generated_resources.h"

27 #include "third_party/cros_system_api/dbus/service_constants.h"	27 #include "third_party/cros_system_api/dbus/service_constants.h"

28 #include "ui/base/l10n/l10n_util.h"	28 #include "ui/base/l10n/l10n_util.h"

29	29

30 namespace chromeos {	30 namespace chromeos {

31	31

32 BluetoothDevice::BluetoothDevice(BluetoothAdapter* adapter)	32 BluetoothDevice::BluetoothDevice(BluetoothAdapter* adapter)

33 : weak_ptr_factory_(this),	33 : weak_ptr_factory_(this),

(...skipping 502 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
536 // static	536 // static

537 BluetoothDevice* BluetoothDevice::CreateUnbound(	537 BluetoothDevice* BluetoothDevice::CreateUnbound(

538 BluetoothAdapter* adapter,	538 BluetoothAdapter* adapter,

539 const BluetoothDeviceClient::Properties* properties) {	539 const BluetoothDeviceClient::Properties* properties) {

540 BluetoothDevice* device = new BluetoothDevice(adapter);	540 BluetoothDevice* device = new BluetoothDevice(adapter);

541 device->Update(properties, false);	541 device->Update(properties, false);

542 return device;	542 return device;

543 }	543 }

544	544

545 } // namespace chromeos	545 } // namespace chromeos

OLD	NEW

« no previous file with comments | « chrome/browser/chromeos/bluetooth/bluetooth_device.h ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | no next file with comments »