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

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

Issue 673813003: SetHostConfiguration() and ConfigureHost() are moved from ScreenObserver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: git cl format Created 6 years, 2 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
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 8eae6eea9e7065fb9b27706793e4af193dee01ce..e27dd4f2935af6fc4fde7e8bf747469a57a88b5b 100644
--- a/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
+++ b/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
@@ -20,6 +20,7 @@ HostPairingScreen::HostPairingScreen(
: BaseScreen(observer),
actor_(actor),
remora_controller_(remora_controller),
+ delegate_(nullptr),
current_stage_(HostPairingController::STAGE_NONE) {
actor_->SetDelegate(this);
remora_controller_->AddObserver(this);
@@ -31,6 +32,10 @@ HostPairingScreen::~HostPairingScreen() {
remora_controller_->RemoveObserver(this);
}
+void HostPairingScreen::SetDelegate(Delegate* delegate) {
+ delegate_ = delegate;
+}
+
void HostPairingScreen::CommitContextChanges() {
if (!context_.HasChanges())
return;
@@ -92,8 +97,10 @@ void HostPairingScreen::ConfigureHost(bool accepted_eula,
<< ", keyboard_layout=" << keyboard_layout;
remora_controller_->RemoveObserver(this);
- get_screen_observer()->ConfigureHost(accepted_eula, lang, timezone,
- send_reports, keyboard_layout);
+ if (delegate_) {
+ delegate_->ConfigureHost(
+ accepted_eula, lang, timezone, send_reports, keyboard_layout);
+ }
get_screen_observer()->OnExit(WizardController::HOST_PAIRING_FINISHED);
}

Powered by Google App Engine
This is Rietveld 408576698