| 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: {
|
|
|