cros: Fold NetworkErrorModel into NetworkErrorView.

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

Index: chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc
index b3092a57d6473f69e9170a80da3d7c198c79f016..f8b7e67430a0e0e6cb05f113706afc2d9ec98be7 100644
--- a/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc
@@ -7,7 +7,7 @@
 #include "ash/common/system/chromeos/devicetype_utils.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
-#include "chrome/browser/chromeos/login/screens/network_error_model.h"
+#include "chrome/browser/chromeos/login/screens/error_screen.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/login/localized_values_builder.h"
@@ -23,15 +23,12 @@ namespace chromeos {
 
 ErrorScreenHandler::ErrorScreenHandler()
     : BaseScreenHandler(kJsScreenPath),
-      model_(nullptr),
-      show_on_init_(false),
-      showing_(false),
       weak_ptr_factory_(this) {
 }
 
 ErrorScreenHandler::~ErrorScreenHandler() {
-  if (model_)
-    model_->OnViewDestroyed(this);
+  if (screen_)
+    screen_->OnViewDestroyed(this);
 }
 
 void ErrorScreenHandler::Show() {
@@ -40,24 +37,24 @@ void ErrorScreenHandler::Show() {
     return;
   }
   BaseScreenHandler::ShowScreen(OobeScreen::SCREEN_ERROR_MESSAGE);
-  if (model_)
-    model_->OnShow();
+  if (screen_)
+    screen_->OnShow();
   showing_ = true;
 }
 
 void ErrorScreenHandler::Hide() {
   showing_ = false;
-  if (model_)
-   model_->OnHide();
+  if (screen_)
+    screen_->OnHide();
 }
 
-void ErrorScreenHandler::Bind(NetworkErrorModel& model) {
-  model_ = &model;
-  BaseScreenHandler::SetBaseScreen(model_);
+void ErrorScreenHandler::Bind(ErrorScreen* screen) {
+  screen_ = screen;
+  BaseScreenHandler::SetBaseScreen(screen_);
 }
 
 void ErrorScreenHandler::Unbind() {
-  model_ = nullptr;
+  screen_ = nullptr;
   BaseScreenHandler::SetBaseScreen(nullptr);
 }
 
@@ -65,11 +62,6 @@ void ErrorScreenHandler::ShowOobeScreen(OobeScreen screen) {
   ShowScreen(screen);
 }
 
-void ErrorScreenHandler::HandleHideCaptivePortal() {
-  if (model_)
-    model_->HideCaptivePortal();
-}
-
 void ErrorScreenHandler::RegisterMessages() {
   AddCallback("hideCaptivePortal",
               &ErrorScreenHandler::HandleHideCaptivePortal);
@@ -127,8 +119,13 @@ void ErrorScreenHandler::Initialize() {
 }
 
 void ErrorScreenHandler::OnConnectToNetworkRequested() {
-  if (showing_ && model_)
-    model_->OnUserAction(NetworkErrorModel::kUserActionConnectRequested);
+  if (showing_ && screen_)
+    screen_->OnUserAction(ErrorScreen::kUserActionConnectRequested);
+}
+
+void ErrorScreenHandler::HandleHideCaptivePortal() {
+  if (screen_)
+    screen_->HideCaptivePortal();
 }
 
 }  // namespace chromeos