diff options
| author | keybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 21:11:11 +0000 |
|---|---|---|
| committer | keybuk@chromium.org <keybuk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 21:11:11 +0000 |
| commit | 39e446866d6c61ce0124870c7c68c198344b6da5 (patch) | |
| tree | f286797a6a5d174596e508e3601e5ea119e2ccac /device | |
| parent | 19c5072ca6d1776ae1d03caaed67dc6dccc0bfe5 (diff) | |
| download | chromium_src-39e446866d6c61ce0124870c7c68c198344b6da5.zip chromium_src-39e446866d6c61ce0124870c7c68c198344b6da5.tar.gz chromium_src-39e446866d6c61ce0124870c7c68c198344b6da5.tar.bz2 | |
Bluetooth: use updated constants
BUG=221813
TEST=device_unittests
Review URL: https://chromiumcodereview.appspot.com/14964007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204339 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device')
| -rw-r--r-- | device/bluetooth/bluetooth_device_experimental_chromeos.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/device/bluetooth/bluetooth_device_experimental_chromeos.cc b/device/bluetooth/bluetooth_device_experimental_chromeos.cc index c7296ba..595ff19 100644 --- a/device/bluetooth/bluetooth_device_experimental_chromeos.cc +++ b/device/bluetooth/bluetooth_device_experimental_chromeos.cc @@ -612,11 +612,11 @@ void BluetoothDeviceExperimentalChromeOS::OnConnectError( // Determine the error code from error_name. ConnectErrorCode error_code = ERROR_UNKNOWN; - if (error_name == bluetooth_adapter::kErrorFailed) { + if (error_name == bluetooth_device::kErrorFailed) { error_code = ERROR_FAILED; - } else if (error_name == bluetooth_adapter::kErrorInProgress) { + } else if (error_name == bluetooth_device::kErrorInProgress) { error_code = ERROR_INPROGRESS; - } else if (error_name == bluetooth_adapter::kErrorNotSupported) { + } else if (error_name == bluetooth_device::kErrorNotSupported) { error_code = ERROR_UNSUPPORTED_DEVICE; } @@ -659,7 +659,7 @@ void BluetoothDeviceExperimentalChromeOS::OnRegisterAgentError( // Determine the error code from error_name. ConnectErrorCode error_code = ERROR_UNKNOWN; - if (error_name == bluetooth_adapter::kErrorAlreadyExists) + if (error_name == bluetooth_agent_manager::kErrorAlreadyExists) error_code = ERROR_INPROGRESS; RecordPairingResult(error_code); @@ -697,17 +697,17 @@ void BluetoothDeviceExperimentalChromeOS::OnPairError( // Determine the error code from error_name. ConnectErrorCode error_code = ERROR_UNKNOWN; - if (error_name == bluetooth_adapter::kErrorConnectionAttemptFailed) { + if (error_name == bluetooth_device::kErrorConnectionAttemptFailed) { error_code = ERROR_FAILED; - } else if (error_name == bluetooth_adapter::kErrorFailed) { + } else if (error_name == bluetooth_device::kErrorFailed) { error_code = ERROR_FAILED; - } else if (error_name == bluetooth_adapter::kErrorAuthenticationFailed) { + } else if (error_name == bluetooth_device::kErrorAuthenticationFailed) { error_code = ERROR_AUTH_FAILED; - } else if (error_name == bluetooth_adapter::kErrorAuthenticationCanceled) { + } else if (error_name == bluetooth_device::kErrorAuthenticationCanceled) { error_code = ERROR_AUTH_CANCELED; - } else if (error_name == bluetooth_adapter::kErrorAuthenticationRejected) { + } else if (error_name == bluetooth_device::kErrorAuthenticationRejected) { error_code = ERROR_AUTH_REJECTED; - } else if (error_name == bluetooth_adapter::kErrorAuthenticationTimeout) { + } else if (error_name == bluetooth_device::kErrorAuthenticationTimeout) { error_code = ERROR_AUTH_TIMEOUT; } |