cros: WIP patch to remove EnableDebuggingScreenView

chrome/browser/ui/webui/chromeos/login/oobe_ui.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/ui/webui/chromeos/login/oobe_ui.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 29 matching lines @@
 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h"
+#include "chrome/browser/ui/webui/chromeos/login/multicast_core_oobe_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
@@ skipping 146 matching lines @@
 const char OobeUI::kAppLaunchSplashDisplay[] = "app-launch-splash";
 const char OobeUI::kArcKioskSplashDisplay[] = "arc-kiosk-splash";
 
 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
     : WebUIController(web_ui) {
   display_type_ = GetDisplayType(url);
 
   network_state_informer_ = new NetworkStateInformer();
   network_state_informer_->Init();
 
+  core_oobe_view_ = base::MakeUnique<MulticastCoreOobeView>();
   js_calls_container = base::MakeUnique<JSCallsContainer>();
 
   auto core_handler =
       base::MakeUnique<CoreOobeHandler>(this, js_calls_container.get());
   core_handler_ = core_handler.get();
   AddWebUIHandler(std::move(core_handler));
+  core_oobe_view_->AddView(core_handler_);
 
   auto network_dropdown_handler = base::MakeUnique<NetworkDropdownHandler>();
   network_dropdown_handler_ = network_dropdown_handler.get();
   AddWebUIHandler(std::move(network_dropdown_handler));
 
   AddScreenHandler(base::MakeUnique<UpdateScreenHandler>());
 
   if (display_type_ == kOobeDisplay)
-    AddScreenHandler(base::MakeUnique<NetworkScreenHandler>(core_handler_));
+    AddScreenHandler(base::MakeUnique<NetworkScreenHandler>(GetCoreOobeView()));
 
-  AddScreenHandler(base::MakeUnique<EnableDebuggingScreenHandler>());
+  auto enable_debugging = base::MakeUnique<EnableDebuggingScreenHandler>();
+  core_oobe_view_->AddView(enable_debugging.get());
+  AddScreenHandler(std::move(enable_debugging));
 
-  AddScreenHandler(base::MakeUnique<EulaScreenHandler>(core_handler_));
+  AddScreenHandler(base::MakeUnique<EulaScreenHandler>(GetCoreOobeView()));
 
   AddScreenHandler(base::MakeUnique<ResetScreenHandler>());
 
   AddScreenHandler(base::MakeUnique<KioskAutolaunchScreenHandler>());
 
   AddScreenHandler(base::MakeUnique<KioskEnableScreenHandler>());
 
   auto supervised_user_creation_screen_handler =
       base::MakeUnique<SupervisedUserCreationScreenHandler>();
   supervised_user_creation_screen_view_ =
       supervised_user_creation_screen_handler.get();
   AddScreenHandler(std::move(supervised_user_creation_screen_handler));
 
   AddScreenHandler(base::MakeUnique<WrongHWIDScreenHandler>());
 
   AddScreenHandler(base::MakeUnique<AutoEnrollmentCheckScreenHandler>());
 
-  AddScreenHandler(base::MakeUnique<HIDDetectionScreenHandler>(core_handler_));
+  AddScreenHandler(
+      base::MakeUnique<HIDDetectionScreenHandler>(GetCoreOobeView()));
 
   AddScreenHandler(base::MakeUnique<ErrorScreenHandler>());
   network_dropdown_handler_->AddObserver(GetView<ErrorScreenHandler>());
 
   error_screen_.reset(new ErrorScreen(nullptr, GetView<ErrorScreenHandler>()));
   ErrorScreen* error_screen = error_screen_.get();
 
   AddScreenHandler(base::MakeUnique<EnrollmentScreenHandler>(
       network_state_informer_, error_screen));
 
   AddScreenHandler(
-      base::MakeUnique<TermsOfServiceScreenHandler>(core_handler_));
+      base::MakeUnique<TermsOfServiceScreenHandler>(GetCoreOobeView()));
 
   AddScreenHandler(base::MakeUnique<ArcTermsOfServiceScreenHandler>());
 
   AddScreenHandler(base::MakeUnique<UserImageScreenHandler>());
 
   AddScreenHandler(base::MakeUnique<UserBoardScreenHandler>());
 
   AddScreenHandler(base::MakeUnique<GaiaScreenHandler>(
-      core_handler_, network_state_informer_));
+      GetCoreOobeView(), network_state_informer_));
 
   auto signin_screen_handler = base::MakeUnique<SigninScreenHandler>(
-      network_state_informer_, error_screen, core_handler_,
+      network_state_informer_, error_screen, GetCoreOobeView(),
       GetView<GaiaScreenHandler>(), js_calls_container.get());
   signin_screen_handler_ = signin_screen_handler.get();
   AddWebUIHandler(std::move(signin_screen_handler));
 
   AddScreenHandler(base::MakeUnique<AppLaunchSplashScreenHandler>(
       network_state_informer_, error_screen));
 
   AddScreenHandler(base::MakeUnique<ArcKioskSplashScreenHandler>());
 
   if (display_type_ == kOobeDisplay) {
@@ skipping 33 matching lines @@
   options::UserImageSource* user_image_source =
       new options::UserImageSource();
   content::URLDataSource::Add(profile, user_image_source);
 
   // TabHelper is required for OOBE webui to make webview working on it.
   content::WebContents* contents = web_ui->GetWebContents();
   extensions::TabHelper::CreateForWebContents(contents);
 }
 
 OobeUI::~OobeUI() {
+  GetCoreOobeView()->SetDelegate(nullptr);
   network_dropdown_handler_->RemoveObserver(GetView<ErrorScreenHandler>());
   if (ash_util::IsRunningInMash()) {
     // TODO: Ash needs to expose screen dimming api. See
     // http://crbug.com/646034.
     NOTIMPLEMENTED();
   }
 }
 
 CoreOobeView* OobeUI::GetCoreOobeView() {
-  return core_handler_;
+  return core_oobe_view_.get();
 }
 
 NetworkView* OobeUI::GetNetworkView() {
   return GetView<NetworkScreenHandler>();
 }
 
 EulaView* OobeUI::GetEulaView() {
   return GetView<EulaScreenHandler>();
 }
 
 UpdateView* OobeUI::GetUpdateView() {
   return GetView<UpdateScreenHandler>();
 }
 
-EnableDebuggingScreenView* OobeUI::GetEnableDebuggingScreenView() {
-  return GetView<EnableDebuggingScreenHandler>();
-}
-
 EnrollmentScreenView* OobeUI::GetEnrollmentScreenView() {
   return GetView<EnrollmentScreenHandler>();
 }
 
 ResetView* OobeUI::GetResetView() {
   return GetView<ResetScreenHandler>();
 }
 
 KioskAutolaunchScreenView* OobeUI::GetKioskAutolaunchScreenView() {
   return GetView<KioskAutolaunchScreenHandler>();
@@ skipping 213 matching lines @@
 }
 
 void OobeUI::UpdateLocalizedStringsIfNeeded() {
   if (oobe_ui_md_mode_ ==
       g_browser_process->local_state()->GetBoolean(prefs::kOobeMdMode)) {
     return;
   }
 
   base::DictionaryValue localized_strings;
   GetLocalizedStrings(&localized_strings);
-  static_cast<CoreOobeView*>(core_handler_)->ReloadContent(localized_strings);
+  GetCoreOobeView()->ReloadContent(localized_strings);
 }
 
 }  // namespace chromeos