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

Unified Diff: chrome/browser/chromeos/login/screens/controller_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/controller_pairing_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc b/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc
index 7b7308e086159a5c1e76e25c74a71838792f5e10..735164bc9758cabc57de9326c6da45f0e2f2fb63 100644
--- a/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc
+++ b/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc
@@ -21,6 +21,7 @@ ControllerPairingScreen::ControllerPairingScreen(
: BaseScreen(observer),
actor_(actor),
shark_controller_(shark_controller),
+ delegate_(nullptr),
current_stage_(ControllerPairingController::STAGE_NONE),
device_preselected_(false) {
actor_->SetDelegate(this);
@@ -33,6 +34,10 @@ ControllerPairingScreen::~ControllerPairingScreen() {
shark_controller_->RemoveObserver(this);
}
+void ControllerPairingScreen::SetDelegate(Delegate* delegate) {
+ delegate_ = delegate;
+}
+
void ControllerPairingScreen::CommitContextChanges() {
if (!context_.HasChanges())
return;
@@ -99,7 +104,8 @@ void ControllerPairingScreen::PairingStageChanged(Stage new_stage) {
break;
}
case ControllerPairingController::STAGE_PAIRING_DONE: {
- get_screen_observer()->SetHostConfiguration();
+ if (delegate_)
+ delegate_->SetHostConfiguration();
break;
}
case ControllerPairingController::STAGE_HOST_UPDATE_IN_PROGRESS: {

Powered by Google App Engine
This is Rietveld 408576698