cros: WIP patch to remove EnableDebuggingScreenView

chrome/browser/chromeos/login/wizard_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 
 #include <signal.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ skipping 239 matching lines @@
 
 PrefService* WizardController::local_state_for_testing_ = nullptr;
 
 WizardController::WizardController(LoginDisplayHost* host, OobeUI* oobe_ui)
     : screen_manager_(this),
       host_(host),
       oobe_ui_(oobe_ui),
       weak_factory_(this) {
   DCHECK(default_controller_ == nullptr);
   default_controller_ = this;
+
+  oobe_ui_->GetCoreOobeView()->SetDelegate(&screen_manager_);
+
   if (!ash_util::IsRunningInMash()) {
     AccessibilityManager* accessibility_manager = AccessibilityManager::Get();
     CHECK(accessibility_manager);
     accessibility_subscription_ = accessibility_manager->RegisterCallback(
         base::Bind(&WizardController::OnAccessibilityStatusChanged,
                    base::Unretained(this)));
   } else {
     NOTIMPLEMENTED();
   }
 }
 
 WizardController::~WizardController() {
+  // OobeUI handlers may have already been destroyed.
+  if (oobe_ui_->GetCoreOobeView())
+    oobe_ui_->GetCoreOobeView()->SetDelegate(nullptr);
+
   if (shark_connection_listener_.get()) {
     base::ThreadTaskRunnerHandle::Get()->DeleteSoon(
         FROM_HERE, shark_connection_listener_.release());
   }
   if (default_controller_ == this) {
     default_controller_ = nullptr;
   } else {
     NOTREACHED() << "More than one controller are alive.";
   }
 }
@@ skipping 90 matching lines @@
                             remora_controller_.get());
   } else if (screen == OobeScreen::SCREEN_USER_IMAGE_PICKER) {
     return new UserImageScreen(this, oobe_ui_->GetUserImageView());
   } else if (screen == OobeScreen::SCREEN_OOBE_EULA) {
     return new EulaScreen(this, this, oobe_ui_->GetEulaView());
   } else if (screen == OobeScreen::SCREEN_OOBE_ENROLLMENT) {
     return new EnrollmentScreen(this, oobe_ui_->GetEnrollmentScreenView());
   } else if (screen == OobeScreen::SCREEN_OOBE_RESET) {
     return new chromeos::ResetScreen(this, oobe_ui_->GetResetView());
   } else if (screen == OobeScreen::SCREEN_OOBE_ENABLE_DEBUGGING) {
-    return new EnableDebuggingScreen(this,
-                                     oobe_ui_->GetEnableDebuggingScreenView());
+    auto* result = new EnableDebuggingScreen(this, oobe_ui_->GetCoreOobeView());
+    // TODO(jdufault): When BaseScreen derives from CoreOobeView we can move the
+    // AddDelegate call directly into ScreenManager. See crbug.com/672142.
+    screen_manager_.AddDelegate(result);
+    return result;
   } else if (screen == OobeScreen::SCREEN_KIOSK_ENABLE) {
     return new KioskEnableScreen(this, oobe_ui_->GetKioskEnableScreenView());
   } else if (screen == OobeScreen::SCREEN_KIOSK_AUTOLAUNCH) {
     return new KioskAutolaunchScreen(this,
                                      oobe_ui_->GetKioskAutolaunchScreenView());
   } else if (screen == OobeScreen::SCREEN_TERMS_OF_SERVICE) {
     return new TermsOfServiceScreen(this,
                                     oobe_ui_->GetTermsOfServiceScreenView());
   } else if (screen == OobeScreen::SCREEN_ARC_TERMS_OF_SERVICE) {
     return new ArcTermsOfServiceScreen(
@@ skipping 1117 matching lines @@
             : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
   }
 
   EnrollmentScreen* screen = EnrollmentScreen::Get(screen_manager());
   screen->SetParameters(effective_config, shark_controller_.get());
   SetStatusAreaVisible(true);
   SetCurrentScreen(screen);
 }
 
 }  // namespace chromeos