cros: Break BaseScreenHandler into two classes.

chrome/browser/ui/webui/chromeos/login/oobe_ui.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/login/oobe_screen.h"
 #include "chrome/browser/chromeos/settings/shutdown_policy_handler.h"
+#include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h"
 #include "content/public/browser/web_ui_controller.h"
 
 namespace ash {
 class ScreenDimmer;
 }
 
 namespace base {
 class DictionaryValue;
 }  // namespace base
 
 namespace chromeos {
 class AppLaunchSplashScreenView;
 class ArcKioskSplashScreenView;
 class ArcTermsOfServiceScreenView;
 class AutoEnrollmentCheckScreenView;
 class BaseScreenHandler;
 class ControllerPairingScreenView;
 class CoreOobeView;
 class DeviceDisabledScreenView;
 class EnableDebuggingScreenView;
 class EnrollmentScreenView;
 class EulaView;
 class ErrorScreen;
-class ErrorScreenHandler;
 class GaiaView;
-class GaiaScreenHandler;
 class HIDDetectionView;
 class HostPairingScreenView;
 class KioskAppMenuHandler;
 class KioskAutolaunchScreenView;
 class KioskEnableScreenView;
 class LoginScreenContext;
 class NativeWindowDelegate;
 class NetworkDropdownHandler;
 class NetworkStateInformer;
 class NetworkView;
 class SigninScreenHandler;
 class SigninScreenHandlerDelegate;
 class SupervisedUserCreationScreenHandler;
 class ResetView;
 class TermsOfServiceScreenView;
-class UserBoardScreenHandler;
 class UserBoardView;
 class UserImageView;
 class UpdateView;
 class WrongHWIDScreenView;
 
 // A custom WebUI that defines datasource for out-of-box-experience (OOBE) UI:
 // - welcome screen (setup language/keyboard/network).
 // - eula screen (CrOS (+ OEM) EULA content/TPM password/crash reporting).
 // - update screen.
 class OobeUI : public content::WebUIController,
@@ skipping 90 matching lines @@
 
   NetworkStateInformer* network_state_informer_for_test() const {
     return network_state_informer_.get();
   }
 
   // Does ReloadContent() if needed (for example, if material design mode has
   // changed).
   void UpdateLocalizedStringsIfNeeded();
 
  private:
+  // Lookup a view by its statically registered OobeScreen.
+  template <typename TView>
+  TView* GetView() {
+    OobeScreen expected_screen = TView::kScreenId;
+    for (BaseScreenHandler* handler : screen_handlers_) {
+      if (expected_screen == handler->oobe_screen())
+        return static_cast<TView*>(handler);
+    }
+
+    NOTREACHED() << "Unable to find handler for screen "
+                 << GetOobeScreenName(expected_screen);
+    return nullptr;
+  }
+
+  void AddWebUIHandler(std::unique_ptr<BaseWebUIHandler> handler);
   void AddScreenHandler(std::unique_ptr<BaseScreenHandler> handler);
 
   // CoreOobeHandler::Delegate implementation:
   void OnCurrentScreenChanged(OobeScreen screen) override;
 
   // Type of UI.
   std::string display_type_;
 
   // Reference to NetworkStateInformer that handles changes in network
   // state.
   scoped_refptr<NetworkStateInformer> network_state_informer_;
 
   // Reference to CoreOobeHandler that handles common requests of Oobe page.
   CoreOobeHandler* core_handler_ = nullptr;
 
   // Reference to NetworkDropdownHandler that handles interaction with
   // network dropdown.
   NetworkDropdownHandler* network_dropdown_handler_ = nullptr;
 
-  // Screens views. Note, OobeUI owns them via |handlers_|, not directly here.
-  UpdateView* update_view_ = nullptr;
-  NetworkView* network_view_ = nullptr;
-  EnableDebuggingScreenView* debugging_screen_view_ = nullptr;
-  EulaView* eula_view_ = nullptr;
-  EnrollmentScreenView* enrollment_screen_view_ = nullptr;
-  ResetView* reset_view_ = nullptr;
-  HIDDetectionView* hid_detection_view_ = nullptr;
-  KioskAutolaunchScreenView* autolaunch_screen_view_ = nullptr;
-  KioskEnableScreenView* kiosk_enable_screen_view_ = nullptr;
-  WrongHWIDScreenView* wrong_hwid_screen_view_ = nullptr;
-  AutoEnrollmentCheckScreenView* auto_enrollment_check_screen_view_ = nullptr;
   SupervisedUserCreationScreenHandler* supervised_user_creation_screen_view_ =
       nullptr;
-  AppLaunchSplashScreenView* app_launch_splash_screen_view_ = nullptr;
-  ArcKioskSplashScreenView* arc_kiosk_splash_screen_view_ = nullptr;
-  ControllerPairingScreenView* controller_pairing_screen_view_ = nullptr;
-  HostPairingScreenView* host_pairing_screen_view_ = nullptr;
-  DeviceDisabledScreenView* device_disabled_screen_view_ = nullptr;
-
-  // Reference to ErrorScreenHandler that handles error screen
-  // requests and forward calls from native code to JS side.
-  ErrorScreenHandler* error_screen_handler_ = nullptr;
-
-  // Reference to GaiaScreenHandler that handles gaia screen requests and
-  // forwards calls from native code to JS side.
-  GaiaScreenHandler* gaia_screen_handler_ = nullptr;
-
-  // Reference to UserBoardScreenHandler, that allows to pick user on device
-  // and attempt authentication.
-  UserBoardScreenHandler* user_board_screen_handler_ = nullptr;
-
   // Reference to SigninScreenHandler that handles sign-in screen requests and
   // forwards calls from native code to JS side.
   SigninScreenHandler* signin_screen_handler_ = nullptr;
 
-  TermsOfServiceScreenView* terms_of_service_screen_view_ = nullptr;
-  ArcTermsOfServiceScreenView* arc_terms_of_service_screen_view_ = nullptr;
-  UserImageView* user_image_view_ = nullptr;
-
-  std::vector<BaseScreenHandler*> handlers_;  // Non-owning pointers.
+  std::vector<BaseWebUIHandler*> webui_handlers_;    // Non-owning pointers.
+  std::vector<BaseScreenHandler*> screen_handlers_;  // Non-owning pointers.
 
   KioskAppMenuHandler* kiosk_app_menu_handler_ =
       nullptr;  // Non-owning pointers.
 
   std::unique_ptr<ErrorScreen> error_screen_;
 
   // Id of the current oobe/login screen.
   OobeScreen current_screen_ = OobeScreen::SCREEN_UNKNOWN;
 
   // Id of the previous oobe/login screen.
@@ skipping 21 matching lines @@
   // Store the deferred JS calls before the screen handler instance is
   // initialized.
   std::unique_ptr<JSCallsContainer> js_calls_container;
 
   DISALLOW_COPY_AND_ASSIGN(OobeUI);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_