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

Unified Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 2251503002: [Bootstrapping] Update the slave device's network connectivity status correctly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months 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
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/wizard_controller.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index f62204d558df520051a08342c2d520cf9ee17ab8..e2274e20c12d40933f7ce0c913e4289a2f887a2a 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -1132,6 +1132,9 @@ void WizardController::ConfigureHostRequested(
}
void WizardController::AddNetworkRequested(const std::string& onc_spec) {
+ remora_controller_->OnNetworkConnectivityChanged(
+ pairing_chromeos::HostPairingController::CONNECTIVITY_CONNECTING);
+
NetworkScreen* network_screen = NetworkScreen::Get(this);
const chromeos::NetworkState* network_state = chromeos::NetworkHandler::Get()
->network_state_handler()
@@ -1142,7 +1145,7 @@ void WizardController::AddNetworkRequested(const std::string& onc_spec) {
onc_spec, base::Bind(&base::DoNothing), base::Bind(&base::DoNothing));
} else {
network_screen->CreateAndConnectNetworkFromOnc(
- onc_spec, base::Bind(&WizardController::InitiateOOBEUpdate,
+ onc_spec, base::Bind(&WizardController::OnSetHostNetworkSuccessful,
weak_factory_.GetWeakPtr()),
base::Bind(&WizardController::OnSetHostNetworkFailed,
weak_factory_.GetWeakPtr()));
@@ -1370,6 +1373,12 @@ void WizardController::OnSharkConnected(
ShowHostPairingScreen();
}
+void WizardController::OnSetHostNetworkSuccessful() {
+ remora_controller_->OnNetworkConnectivityChanged(
+ pairing_chromeos::HostPairingController::CONNECTIVITY_CONNECTED);
+ InitiateOOBEUpdate();
+}
+
void WizardController::OnSetHostNetworkFailed() {
remora_controller_->OnNetworkConnectivityChanged(
pairing_chromeos::HostPairingController::CONNECTIVITY_NONE);
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698