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

Unified Diff: chrome/browser/chromeos/login/screens/host_pairing_screen.cc

Issue 528803002: Host pairing OOBE starts at the right time. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nit fixed. Created 6 years, 3 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 | « no previous file | chrome/browser/chromeos/login/wizard_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/screens/host_pairing_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/host_pairing_screen.cc b/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
index 81aa58fd7bad99bf9d89d5471a7b9143cc6c72e7..9862e485d8a243bc8095cd1b1075e0cbe559b924 100644
--- a/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
+++ b/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
@@ -46,7 +46,7 @@ void HostPairingScreen::PrepareToShow() {
void HostPairingScreen::Show() {
if (actor_)
actor_->Show();
- controller_->StartPairing();
+ PairingStageChanged(controller_->GetCurrentStage());
}
void HostPairingScreen::Hide() {
@@ -59,8 +59,6 @@ std::string HostPairingScreen::GetName() const {
}
void HostPairingScreen::PairingStageChanged(Stage new_stage) {
- DCHECK(new_stage != current_stage_);
-
std::string desired_page;
switch (new_stage) {
case HostPairingController::STAGE_NONE:
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/wizard_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698