cros: Fold ResetModel into ResetScreen

chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc

Index: chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc
index a162c27e02b080a47329ebd0a08099d9475cb7d4..bbd56c3db1dcb1676f670c59d60e5c7ee90743a4 100644
--- a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/login/oobe_screen.h"
-#include "chrome/browser/chromeos/login/screens/reset_model.h"
+#include "chrome/browser/chromeos/login/screens/reset_screen.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
@@ -27,15 +27,11 @@ const char kJsScreenPath[] = "login.ResetScreen";
 
 namespace chromeos {
 
-ResetScreenHandler::ResetScreenHandler()
-    : BaseScreenHandler(kJsScreenPath),
-      model_(nullptr),
-      show_on_init_(false) {
-}
+ResetScreenHandler::ResetScreenHandler() : BaseScreenHandler(kJsScreenPath) {}
 
 ResetScreenHandler::~ResetScreenHandler() {
-  if (model_)
-    model_->OnViewDestroyed(this);
+  if (screen_)
+    screen_->OnViewDestroyed(this);
 }
 
 void ResetScreenHandler::Show() {
@@ -107,13 +103,13 @@ void ResetScreenHandler::Initialize() {
   }
 }
 
-void ResetScreenHandler::Bind(ResetModel& model) {
-  model_ = &model;
-  BaseScreenHandler::SetBaseScreen(model_);
+void ResetScreenHandler::Bind(ResetScreen* screen) {
+  screen_ = screen;
+  BaseScreenHandler::SetBaseScreen(screen_);
 }
 
 void ResetScreenHandler::Unbind() {
-  model_ = nullptr;
+  screen_ = nullptr;
   BaseScreenHandler::SetBaseScreen(nullptr);
 }