summaryrefslogtreecommitdiffstats
path: root/components/pairing
diff options
context:
space:
mode:
authorzork <zork@chromium.org>2014-10-22 16:42:18 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-22 23:43:01 +0000
commite467802dc7b7f556b109761bfc92bf0e433536d3 (patch)
tree73b4ea0ccd423c1f7ac7f369e12c34375ccd8952 /components/pairing
parent8baef9c857f5228cd40ad6ff52669a3655de32ed (diff)
downloadchromium_src-e467802dc7b7f556b109761bfc92bf0e433536d3.zip
chromium_src-e467802dc7b7f556b109761bfc92bf0e433536d3.tar.gz
chromium_src-e467802dc7b7f556b109761bfc92bf0e433536d3.tar.bz2
Set the proper stage on pairing connection error
BUG=426225 Review URL: https://codereview.chromium.org/669263002 Cr-Commit-Position: refs/heads/master@{#300800}
Diffstat (limited to 'components/pairing')
-rw-r--r--components/pairing/bluetooth_controller_pairing_controller.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/components/pairing/bluetooth_controller_pairing_controller.cc b/components/pairing/bluetooth_controller_pairing_controller.cc
index 56c34db..1d8e026 100644
--- a/components/pairing/bluetooth_controller_pairing_controller.cc
+++ b/components/pairing/bluetooth_controller_pairing_controller.cc
@@ -204,6 +204,9 @@ void BluetoothControllerPairingController::OnConnectError(
// devices. If the connection fails, it's not a problem as long as pairing
// was successful.
OnConnect();
+ } else {
+ // This can happen if the confirmation dialog times out.
+ ChangeStage(STAGE_ESTABLISHING_CONNECTION_ERROR);
}
}