summaryrefslogtreecommitdiffstats
path: root/device/bluetooth/bluetooth_discovery_session_outcome.h
diff options
context:
space:
mode:
authoryoichio <yoichio@chromium.org>2015-09-29 00:39:22 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-29 07:39:59 +0000
commit500c6dbb7438f38c5bb28c529d4bd43e6d1b1f9e (patch)
tree43fd774d2c09ad46db949e824bce328e158ba57d /device/bluetooth/bluetooth_discovery_session_outcome.h
parenta543d12194462ac37a25d150dcbb0077ccd72b73 (diff)
downloadchromium_src-500c6dbb7438f38c5bb28c529d4bd43e6d1b1f9e.zip
chromium_src-500c6dbb7438f38c5bb28c529d4bd43e6d1b1f9e.tar.gz
chromium_src-500c6dbb7438f38c5bb28c529d4bd43e6d1b1f9e.tar.bz2
Revert of Add Linux support for the Bluetooth API. (patchset #10 id:90001 of
https://codereview.chromium.org/1367663002/ ) Reason for revert: perf regression. http://build.chromium.org/p/chromium/builders/Linux%20x64/builds/10130 Original issue's description: > Add Linux support for the Bluetooth API. > > This refactors all the code in //device/bluetooth to be non-ChromeOS specific > and adds code to enable all of it to run on Linux through the linux specific > DBusThreadManager that is added. > > This CL depends on https://codereview.chromium.org/1347193004/ > > Owners reviews requested, > //device - armansito@ > //extensions - rockot@ > //chrome/browser/chrome_browser_main_linux.* - jhawkins@ > > R=armansito@chromium.org, jhawkins@chromium.org, rockot@chromium.org > BUG=522633 > > Committed: https://crrev.com/17fcdab015a073437404f35e7e63c1464280d36b > Cr-Commit-Position: refs/heads/master@{#351237} TBR=armansito@chromium.org,jhawkins@chromium.org,rockot@chromium.org,jdeokule@chromi um.org,scheib@chromium.org,rkc@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=522633 Review URL: https://codereview.chromium.org/1380463003 Cr-Commit-Position: refs/heads/master@{#351266}
Diffstat (limited to 'device/bluetooth/bluetooth_discovery_session_outcome.h')
-rw-r--r--device/bluetooth/bluetooth_discovery_session_outcome.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/device/bluetooth/bluetooth_discovery_session_outcome.h b/device/bluetooth/bluetooth_discovery_session_outcome.h
index 9bc83a3..38cf3a1 100644
--- a/device/bluetooth/bluetooth_discovery_session_outcome.h
+++ b/device/bluetooth/bluetooth_discovery_session_outcome.h
@@ -23,12 +23,12 @@ enum class UMABluetoothDiscoverySessionOutcome {
ACTIVE_SESSION_NOT_IN_ADAPTER = 7,
FAILED = 8,
- // BlueZ-specific failures:
- BLUEZ_DBUS_UNKNOWN_ADAPTER = 9,
- BLUEZ_DBUS_NO_RESPONSE = 10,
- BLUEZ_DBUS_IN_PROGRESS = 11,
- BLUEZ_DBUS_NOT_READY = 12,
- BLUEZ_DBUS_FAILED_MAYBE_UNSUPPORTED_TRANSPORT = 13,
+ // ChromeOS-specific failures:
+ CHROMEOS_DBUS_UNKNOWN_ADAPTER = 9,
+ CHROMEOS_DBUS_NO_RESPONSE = 10,
+ CHROMEOS_DBUS_IN_PROGRESS = 11,
+ CHROMEOS_DBUS_NOT_READY = 12,
+ CHROMEOS_DBUS_FAILED_MAYBE_UNSUPPORTED_TRANSPORT = 13,
// NOTE: Add new outcomes immediately above this line. Make sure to update the
// enum list in tools/metrics/histograms/histograms.xml accordingly.
COUNT