cros: Unify oobe View/Actor naming to just View.

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/core_oobe_view.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"
@@ skipping 13 matching lines @@
 namespace {
 
 const char kJsScreenPath[] = "login.NetworkScreen";
 
 }  // namespace
 
 namespace chromeos {
 
 // NetworkScreenHandler, public: -----------------------------------------------
 
-NetworkScreenHandler::NetworkScreenHandler(CoreOobeActor* core_oobe_actor)
-    : core_oobe_actor_(core_oobe_actor) {
+NetworkScreenHandler::NetworkScreenHandler(CoreOobeView* core_oobe_view)
+    : core_oobe_view_(core_oobe_view) {
   set_call_js_prefix(kJsScreenPath);
-  DCHECK(core_oobe_actor_);
+  DCHECK(core_oobe_view_);
 }
 
 NetworkScreenHandler::~NetworkScreenHandler() {
   if (screen_)
     screen_->OnViewDestroyed(this);
 }
 
-// NetworkScreenHandler, NetworkScreenActor implementation: --------------------
+// NetworkScreenHandler, NetworkScreenView implementation: ---------------------
 
 void NetworkScreenHandler::Show() {
   if (!page_is_ready()) {
     show_on_init_ = true;
     return;
   }
 
   PrefService* prefs = g_browser_process->local_state();
   if (prefs->GetBoolean(prefs::kFactoryResetRequested)) {
-    if (core_oobe_actor_)
-      core_oobe_actor_->ShowDeviceResetScreen();
+    if (core_oobe_view_)
+      core_oobe_view_->ShowDeviceResetScreen();
 
     return;
   } else if (prefs->GetBoolean(prefs::kDebuggingFeaturesRequested)) {
-    if (core_oobe_actor_)
-      core_oobe_actor_->ShowEnableDebuggingScreen();
+    if (core_oobe_view_)
+      core_oobe_view_->ShowEnableDebuggingScreen();
 
     return;
   }
 
   // Make sure all our network technologies are turned on. On OOBE, the user
   // should be able to select any of the available networks on the device.
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   handler->SetTechnologyEnabled(NetworkTypePattern::NonVirtual(),
                                 true,
                                 chromeos::network_handler::ErrorCallback());
 
   base::DictionaryValue network_screen_params;
   network_screen_params.SetBoolean("isDeveloperMode",
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kSystemDevMode));
   ShowScreenWithData(OobeScreen::SCREEN_OOBE_NETWORK, &network_screen_params);
-  core_oobe_actor_->InitDemoModeDetection();
+  core_oobe_view_->InitDemoModeDetection();
 }
 
 void NetworkScreenHandler::Hide() {
 }
 
 void NetworkScreenHandler::Bind(NetworkScreen* screen) {
   screen_ = screen;
   BaseScreenHandler::SetBaseScreen(screen_);
 }
 
 void NetworkScreenHandler::Unbind() {
   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();
+    core_oobe_view_->ClearErrors();
 }
 
 void NetworkScreenHandler::StopDemoModeDetection() {
-  core_oobe_actor_->StopDemoModeDetection();
+  core_oobe_view_->StopDemoModeDetection();
 }
 
 void NetworkScreenHandler::ShowConnectingStatus(
     bool connecting,
     const base::string16& network_id) {
 }
 
 void NetworkScreenHandler::ReloadLocalizedContent() {
   base::DictionaryValue localized_strings;
   GetOobeUI()->GetLocalizedStrings(&localized_strings);
-  core_oobe_actor_->ReloadContent(localized_strings);
+  core_oobe_view_->ReloadContent(localized_strings);
 }
 
 // NetworkScreenHandler, BaseScreenHandler implementation: --------------------
 
 void NetworkScreenHandler::DeclareLocalizedValues(
     ::login::LocalizedValuesBuilder* builder) {
   if (system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation())
     builder->Add("networkScreenGreeting", IDS_REMORA_CONFIRM_MESSAGE);
   else
     builder->Add("networkScreenGreeting", IDS_WELCOME_SCREEN_GREETING);
@@ skipping 139 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