summaryrefslogtreecommitdiffstats
path: root/components/pairing/bluetooth_host_pairing_controller.cc
diff options
context:
space:
mode:
authorzork <zork@chromium.org>2015-04-21 18:13:52 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-22 01:14:08 +0000
commitb7c25e1ec39ec11d2156b2918d58f4de7fcd9791 (patch)
treebe92bd713e17eadfc65f4b24a49593a92983b5a0 /components/pairing/bluetooth_host_pairing_controller.cc
parent63d36f32e780f052716384851adfabd17edf8639 (diff)
downloadchromium_src-b7c25e1ec39ec11d2156b2918d58f4de7fcd9791.zip
chromium_src-b7c25e1ec39ec11d2156b2918d58f4de7fcd9791.tar.gz
chromium_src-b7c25e1ec39ec11d2156b2918d58f4de7fcd9791.tar.bz2
Add AddNetwork message to pairing API.
BUG=None Review URL: https://codereview.chromium.org/1090483002 Cr-Commit-Position: refs/heads/master@{#326206}
Diffstat (limited to 'components/pairing/bluetooth_host_pairing_controller.cc')
-rw-r--r--components/pairing/bluetooth_host_pairing_controller.cc21
1 files changed, 15 insertions, 6 deletions
diff --git a/components/pairing/bluetooth_host_pairing_controller.cc b/components/pairing/bluetooth_host_pairing_controller.cc
index 5ffd2f5..580d92f 100644
--- a/components/pairing/bluetooth_host_pairing_controller.cc
+++ b/components/pairing/bluetooth_host_pairing_controller.cc
@@ -307,11 +307,12 @@ void BluetoothHostPairingController::OnHostStatusMessage(
void BluetoothHostPairingController::OnConfigureHostMessage(
const pairing_api::ConfigureHost& message) {
FOR_EACH_OBSERVER(Observer, observers_,
- ConfigureHost(message.parameters().accepted_eula(),
- message.parameters().lang(),
- message.parameters().timezone(),
- message.parameters().send_reports(),
- message.parameters().keyboard_layout()));
+ ConfigureHostRequested(
+ message.parameters().accepted_eula(),
+ message.parameters().lang(),
+ message.parameters().timezone(),
+ message.parameters().send_reports(),
+ message.parameters().keyboard_layout()));
}
void BluetoothHostPairingController::OnPairDevicesMessage(
@@ -319,7 +320,8 @@ void BluetoothHostPairingController::OnPairDevicesMessage(
DCHECK(thread_checker_.CalledOnValidThread());
ChangeStage(STAGE_ENROLLING);
FOR_EACH_OBSERVER(Observer, observers_,
- EnrollHost(message.parameters().admin_access_token()));
+ EnrollHostRequested(
+ message.parameters().admin_access_token()));
}
void BluetoothHostPairingController::OnCompleteSetupMessage(
@@ -339,6 +341,13 @@ void BluetoothHostPairingController::OnErrorMessage(
NOTREACHED();
}
+void BluetoothHostPairingController::OnAddNetworkMessage(
+ const pairing_api::AddNetwork& message) {
+ DCHECK(thread_checker_.CalledOnValidThread());
+ FOR_EACH_OBSERVER(Observer, observers_,
+ AddNetworkRequested(message.parameters().onc_spec()));
+}
+
void BluetoothHostPairingController::AdapterPresentChanged(
device::BluetoothAdapter* adapter,
bool present) {