Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(627)

Unified Diff: components/pairing/bluetooth_host_pairing_controller.cc

Issue 1519883003: 1) Add basic configuration (network connection, language, keyboard layout, timezone) setup page. 2)… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
Index: components/pairing/bluetooth_host_pairing_controller.cc
diff --git a/components/pairing/bluetooth_host_pairing_controller.cc b/components/pairing/bluetooth_host_pairing_controller.cc
index 088dadac5d5321faed14263f8715c1ee76ab28c4..bc28e79914405f77b8d9deba5e6501d0431e7817 100644
--- a/components/pairing/bluetooth_host_pairing_controller.cc
+++ b/components/pairing/bluetooth_host_pairing_controller.cc
@@ -74,14 +74,6 @@ BluetoothHostPairingController::~BluetoothHostPairingController() {
}
}
-void BluetoothHostPairingController::ChangeStage(Stage new_stage) {
- if (current_stage_ == new_stage)
- return;
- VLOG(1) << "ChangeStage " << new_stage;
- current_stage_ = new_stage;
- FOR_EACH_OBSERVER(Observer, observers_, PairingStageChanged(new_stage));
-}
-
void BluetoothHostPairingController::SendHostStatus() {
pairing_api::HostStatus host_status;
@@ -309,6 +301,7 @@ void BluetoothHostPairingController::OnHostStatusMessage(
void BluetoothHostPairingController::OnConfigureHostMessage(
const pairing_api::ConfigureHost& message) {
+ ChangeStage(STAGE_SETUP_BASIC_CONFIGURATION);
FOR_EACH_OBSERVER(Observer, observers_,
ConfigureHostRequested(
message.parameters().accepted_eula(),
@@ -374,6 +367,14 @@ HostPairingController::Stage BluetoothHostPairingController::GetCurrentStage() {
return current_stage_;
}
+void BluetoothHostPairingController::ChangeStage(Stage new_stage) {
+ if (current_stage_ == new_stage)
+ return;
+ VLOG(1) << "ChangeStage " << new_stage;
+ current_stage_ = new_stage;
+ FOR_EACH_OBSERVER(Observer, observers_, PairingStageChanged(new_stage));
+}
+
void BluetoothHostPairingController::StartPairing() {
DCHECK_EQ(current_stage_, STAGE_NONE);
bool bluetooth_available =

Powered by Google App Engine
This is Rietveld 408576698