chromeos/dbus/bluetooth_adapter_client.cc - Issue 10546010: Implement support for the OOB Pairing APIs.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10546010: Implement support for the OOB Pairing APIs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: refactor to create BluetoothOutOfBandClient 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

« chrome/browser/chromeos/bluetooth/bluetooth_adapter.cc ('K') | « chromeos/chromeos.gyp ('k') | chromeos/dbus/bluetooth_out_of_band_client.h » ('j') | chromeos/dbus/bluetooth_out_of_band_client.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "chromeos/dbus/bluetooth_adapter_client.h"	5 #include "chromeos/dbus/bluetooth_adapter_client.h"

6	6

7 #include <map>	7 #include <map>

	8 #include <utility>
	keybuk 2012/06/08 20:06:39 is this a hold-over from a previous patch? is this a hold-over from a previous patch? bryeung 2012/06/14 15:31:08 this was to make it lint clean...I'll fix in a dif Show quoted text On 2012/06/08 20:06:39, keybuk wrote: > is this a hold-over from a previous patch? this was to make it lint clean...I'll fix in a different CL
8	9

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

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

11 #include "base/stl_util.h"	12 #include "base/stl_util.h"

12 #include "chromeos/dbus/bluetooth_device_client.h"	13 #include "chromeos/dbus/bluetooth_device_client.h"

13 #include "chromeos/dbus/bluetooth_manager_client.h"	14 #include "chromeos/dbus/bluetooth_manager_client.h"

14 #include "chromeos/dbus/bluetooth_property.h"	15 #include "chromeos/dbus/bluetooth_property.h"

15 #include "dbus/bus.h"	16 #include "dbus/bus.h"

16 #include "dbus/message.h"	17 #include "dbus/message.h"

17 #include "dbus/object_path.h"	18 #include "dbus/object_path.h"

(...skipping 830 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
848 DBusClientImplementationType type,	849 DBusClientImplementationType type,

849 dbus::Bus* bus,	850 dbus::Bus* bus,

850 BluetoothManagerClient* manager_client) {	851 BluetoothManagerClient* manager_client) {

851 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)	852 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)

852 return new BluetoothAdapterClientImpl(bus, manager_client);	853 return new BluetoothAdapterClientImpl(bus, manager_client);

853 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);	854 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);

854 return new BluetoothAdapterClientStubImpl();	855 return new BluetoothAdapterClientStubImpl();

855 }	856 }

856	857

857 } // namespace chromeos	858 } // namespace chromeos

OLD	NEW