Fold UpdateModel into UpdateScreen.

chrome/browser/ui/webui/chromeos/login/update_screen_handler.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/update_screen_handler.h"
 
 #include <memory>
 
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/oobe_screen.h"
-#include "chrome/browser/chromeos/login/screens/update_model.h"
+#include "chrome/browser/chromeos/login/screens/update_screen.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/login/localized_values_builder.h"
 
 namespace {
 
 const char kJsScreenPath[] = "login.UpdateScreen";
 
 }  // namespace
 
 namespace chromeos {
 
-UpdateScreenHandler::UpdateScreenHandler()
-    : BaseScreenHandler(kJsScreenPath), model_(nullptr), show_on_init_(false) {
-}
+UpdateScreenHandler::UpdateScreenHandler() : BaseScreenHandler(kJsScreenPath) {}
 
 UpdateScreenHandler::~UpdateScreenHandler() {
-  if (model_)
-    model_->OnViewDestroyed(this);
+  if (screen_)
+    screen_->OnViewDestroyed(this);
 }
 
 void UpdateScreenHandler::DeclareLocalizedValues(
     ::login::LocalizedValuesBuilder* builder) {
   builder->Add("checkingForUpdatesMsg", IDS_CHECKING_FOR_UPDATE_MSG);
   builder->Add("installingUpdateDesc", IDS_UPDATE_MSG);
   builder->Add("updateScreenTitle", IDS_UPDATE_SCREEN_TITLE);
   builder->Add("updateScreenAccessibleTitle",
                IDS_UPDATE_SCREEN_ACCESSIBLE_TITLE);
   builder->Add("checkingForUpdates", IDS_CHECKING_FOR_UPDATES);
@@ skipping 28 matching lines @@
   if (!page_is_ready()) {
     show_on_init_ = true;
     return;
   }
   ShowScreen(OobeScreen::SCREEN_OOBE_UPDATE);
 }
 
 void UpdateScreenHandler::Hide() {
 }
 
-void UpdateScreenHandler::Bind(UpdateModel& model) {
-  model_ = &model;
-  BaseScreenHandler::SetBaseScreen(model_);
+void UpdateScreenHandler::Bind(UpdateScreen* screen) {
+  screen_ = screen;
+  BaseScreenHandler::SetBaseScreen(screen_);
 }
 
 void UpdateScreenHandler::Unbind() {
-  model_ = nullptr;
+  screen_ = nullptr;
   BaseScreenHandler::SetBaseScreen(nullptr);
 }
 
 }  // namespace chromeos