device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.h - Issue 2389393005: Revert of components/arc: implement multi advertising

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

Unified Diff: device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.h

Issue 2389393005: Revert of components/arc: implement multi advertising (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@plumb-incoming-connections

Patch Set: Created 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « device/bluetooth/bluez/bluetooth_advertisement_bluez_unittest.cc ('k') | device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.h

diff --git a/device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.h b/device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.h

index ee5431160f54964ba8fe31b70cf994611f2ffc4a..bd7826f42d263846c40053f98a994e369ade7f8f 100644

--- a/device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.h

+++ b/device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.h

@@ -61,10 +61,6 @@

FakeBluetoothLEAdvertisementServiceProvider* GetAdvertisementServiceProvider(

const std::string& uuid);

- int currently_registered() { return currently_registered_.size(); }

- enum : size_t { kMaxBluezAdvertisements = 5 };

private:

// Map of a D-Bus object path to the FakeBluetoothAdvertisementServiceProvider

// registered for it; maintained by RegisterAdvertisementServiceProvider() and

@@ -75,8 +71,9 @@

ServiceProviderMap;

ServiceProviderMap service_provider_map_;

- // Holds currently registered advertisements.

- std::vector<dbus::ObjectPath> currently_registered_;

+ // Holds the currently registered advertisement. If there is no advertisement

+ // registered, this path is empty.

+ dbus::ObjectPath currently_registered_;

DISALLOW_COPY_AND_ASSIGN(FakeBluetoothLEAdvertisingManagerClient);

};