cros: Fold NetworkModel into NetworkScreen

chrome/browser/ui/webui/chromeos/login/network_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/network_screen_handler.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_runner_util.h"
 #include "base/threading/worker_pool.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/customization/customization_document.h"
 #include "chrome/browser/chromeos/idle_detector.h"
 #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
-#include "chrome/browser/chromeos/login/screens/network_model.h"
+#include "chrome/browser/chromeos/login/screens/network_screen.h"
 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/system/input_device_settings.h"
 #include "chrome/browser/chromeos/system/timezone_util.h"
 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/chromeos_switches.h"
@@ skipping 13 matching lines @@
 
 const char kJsScreenPath[] = "login.NetworkScreen";
 
 }  // namespace
 
 namespace chromeos {
 
 // NetworkScreenHandler, public: -----------------------------------------------
 
 NetworkScreenHandler::NetworkScreenHandler(CoreOobeActor* core_oobe_actor)
-    : BaseScreenHandler(kJsScreenPath),
-      core_oobe_actor_(core_oobe_actor),
-      model_(nullptr),
-      show_on_init_(false) {
+    : BaseScreenHandler(kJsScreenPath), core_oobe_actor_(core_oobe_actor) {
   DCHECK(core_oobe_actor_);
 }
 
 NetworkScreenHandler::~NetworkScreenHandler() {
-  if (model_)
-    model_->OnViewDestroyed(this);
+  if (screen_)
+    screen_->OnViewDestroyed(this);
 }
 
 // NetworkScreenHandler, NetworkScreenActor implementation: --------------------
 
 void NetworkScreenHandler::Show() {
   if (!page_is_ready()) {
     show_on_init_ = true;
     return;
   }
 
@@ skipping 21 matching lines @@
   network_screen_params.SetBoolean("isDeveloperMode",
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kSystemDevMode));
   ShowScreenWithData(OobeScreen::SCREEN_OOBE_NETWORK, &network_screen_params);
   core_oobe_actor_->InitDemoModeDetection();
 }
 
 void NetworkScreenHandler::Hide() {
 }
 
-void NetworkScreenHandler::Bind(NetworkModel& model) {
-  model_ = &model;
-  BaseScreenHandler::SetBaseScreen(model_);
+void NetworkScreenHandler::Bind(NetworkScreen* screen) {
+  screen_ = screen;
+  BaseScreenHandler::SetBaseScreen(screen_);
 }
 
 void NetworkScreenHandler::Unbind() {
-  model_ = nullptr;
+  screen_ = nullptr;
   BaseScreenHandler::SetBaseScreen(nullptr);
 }
 
 void NetworkScreenHandler::ShowError(const base::string16& message) {
   CallJS("showError", message);
 }
 
 void NetworkScreenHandler::ClearErrors() {
   if (page_is_ready())
     core_oobe_actor_->ClearErrors();
@@ skipping 69 matching lines @@
     base::DictionaryValue* dict) {
   const std::string application_locale =
       g_browser_process->GetApplicationLocale();
   const std::string selected_input_method =
       input_method::InputMethodManager::Get()
           ->GetActiveIMEState()
           ->GetCurrentInputMethod()
           .id();
 
   std::unique_ptr<base::ListValue> language_list;
-  if (model_) {
-    if (model_->GetLanguageList() &&
-        model_->GetLanguageListLocale() == application_locale) {
-      language_list.reset(model_->GetLanguageList()->DeepCopy());
+  if (screen_) {
+    if (screen_->language_list() &&
+        screen_->language_list_locale() == application_locale) {
+      language_list.reset(screen_->language_list()->DeepCopy());
     } else {
-      model_->UpdateLanguageList();
+      screen_->UpdateLanguageList();
     }
   }
 
   if (!language_list)
     language_list = GetMinimalUILanguageList();
 
   // GetAdditionalParameters() is called when OOBE language is updated.
   // This happens in three different cases:
   //
   // 1) User selects new locale on OOBE screen. We need to sync active input
@@ skipping 31 matching lines @@
   dict->Set("timezoneList", GetTimezoneList());
 }
 
 void NetworkScreenHandler::Initialize() {
   if (show_on_init_) {
     show_on_init_ = false;
     Show();
   }
 
   // Reload localized strings if they are already resolved.
-  if (model_ && model_->GetLanguageList())
+  if (screen_ && screen_->language_list())
     ReloadLocalizedContent();
 }
 
 // NetworkScreenHandler, private: ----------------------------------------------
 
 // static
 base::ListValue* NetworkScreenHandler::GetTimezoneList() {
   std::string current_timezone_id;
   CrosSettings::Get()->GetString(kSystemTimezone, &current_timezone_id);
 
@@ skipping 14 matching lines @@
     timezone_option->SetString("value", timezone_id);
     timezone_option->SetString("title", timezone_name);
     timezone_option->SetBoolean("selected", timezone_id == current_timezone_id);
     timezone_list->Append(std::move(timezone_option));
   }
 
   return timezone_list.release();
 }
 
 }  // namespace chromeos