Revert of Reset Screen moved to ScreenContext.

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 "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
@@ skipping 190 matching lines @@
 
 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
     : WebUIController(web_ui),
       core_handler_(nullptr),
       network_dropdown_handler_(nullptr),
       update_screen_handler_(nullptr),
       network_view_(nullptr),
       debugging_screen_actor_(nullptr),
       eula_view_(nullptr),
       hid_detection_screen_actor_(nullptr),
-      reset_view_(nullptr),
+      reset_screen_actor_(nullptr),
       autolaunch_screen_actor_(nullptr),
       kiosk_enable_screen_actor_(nullptr),
       wrong_hwid_screen_actor_(nullptr),
       auto_enrollment_check_screen_actor_(nullptr),
       supervised_user_creation_screen_actor_(nullptr),
       app_launch_splash_screen_actor_(nullptr),
       controller_pairing_screen_actor_(nullptr),
       host_pairing_screen_actor_(nullptr),
       device_disabled_screen_actor_(nullptr),
       error_screen_handler_(nullptr),
@@ skipping 31 matching lines @@
   EnableDebuggingScreenHandler* debugging_screen_handler =
       new EnableDebuggingScreenHandler();
   debugging_screen_actor_ = debugging_screen_handler;
   AddScreenHandler(debugging_screen_handler);
 
   EulaScreenHandler* eula_screen_handler = new EulaScreenHandler(core_handler_);
   eula_view_ = eula_screen_handler;
   AddScreenHandler(eula_screen_handler);
 
   ResetScreenHandler* reset_screen_handler = new ResetScreenHandler();
-  reset_view_ = reset_screen_handler;
+  reset_screen_actor_ = reset_screen_handler;
   AddScreenHandler(reset_screen_handler);
 
   KioskAutolaunchScreenHandler* autolaunch_screen_handler =
       new KioskAutolaunchScreenHandler();
   autolaunch_screen_actor_ = autolaunch_screen_handler;
   AddScreenHandler(autolaunch_screen_handler);
 
   KioskEnableScreenHandler* kiosk_enable_screen_handler =
       new KioskEnableScreenHandler();
   kiosk_enable_screen_actor_ = kiosk_enable_screen_handler;
@@ skipping 146 matching lines @@
 }
 
 EnableDebuggingScreenActor* OobeUI::GetEnableDebuggingScreenActor() {
   return debugging_screen_actor_;
 }
 
 EnrollmentScreenActor* OobeUI::GetEnrollmentScreenActor() {
   return enrollment_screen_actor_;
 }
 
-ResetView* OobeUI::GetResetView() {
-  return reset_view_;
+ResetScreenActor* OobeUI::GetResetScreenActor() {
+  return reset_screen_actor_;
 }
 
 KioskAutolaunchScreenActor* OobeUI::GetKioskAutolaunchScreenActor() {
   return autolaunch_screen_actor_;
 }
 
 KioskEnableScreenActor* OobeUI::GetKioskEnableScreenActor() {
   return kiosk_enable_screen_actor_;
 }
 
@@ skipping 213 matching lines @@
   DCHECK(screen_ids_.count(screen))
       << "Screen should be registered in InitializeScreenMaps()";
   Screen new_screen = screen_ids_[screen];
   FOR_EACH_OBSERVER(Observer,
                     observer_list_,
                     OnCurrentScreenChanged(current_screen_, new_screen));
   current_screen_ = new_screen;
 }
 
 }  // namespace chromeos