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

chrome/browser/chromeos/login/screens/controller_pairing_screen.cc

 // Copyright 2014 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/chromeos/login/screens/controller_pairing_screen.h"
 
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 
 using namespace chromeos::controller_pairing;
 using namespace pairing_chromeos;
 
 namespace chromeos {
 
 ControllerPairingScreen::ControllerPairingScreen(
     BaseScreenDelegate* base_screen_delegate,
     Delegate* delegate,
-    ControllerPairingScreenActor* actor,
+    ControllerPairingScreenView* view,
     ControllerPairingController* shark_controller)
     : BaseScreen(base_screen_delegate,
                  OobeScreen::SCREEN_OOBE_CONTROLLER_PAIRING),
       delegate_(delegate),
-      actor_(actor),
+      view_(view),
       shark_controller_(shark_controller),
       current_stage_(ControllerPairingController::STAGE_NONE),
       device_preselected_(false) {
-  actor_->SetDelegate(this);
+  view_->SetDelegate(this);
   shark_controller_->AddObserver(this);
 }
 
 ControllerPairingScreen::~ControllerPairingScreen() {
-  if (actor_)
-    actor_->SetDelegate(NULL);
+  if (view_)
+    view_->SetDelegate(nullptr);
   shark_controller_->RemoveObserver(this);
 }
 
 void ControllerPairingScreen::CommitContextChanges() {
   if (!context_.HasChanges())
     return;
   base::DictionaryValue diff;
   context_.GetChangesAndReset(&diff);
-  if (actor_)
-    actor_->OnContextChanged(diff);
+  if (view_)
+    view_->OnContextChanged(diff);
 }
 
 bool ControllerPairingScreen::ExpectStageIs(Stage stage) const {
   DCHECK(stage == current_stage_);
   if (current_stage_ != stage)
     LOG(ERROR) << "Incorrect stage. Expected: " << stage
                << ", current stage: " << current_stage_;
   return stage == current_stage_;
 }
 
 void ControllerPairingScreen::Show() {
-  if (actor_)
-    actor_->Show();
+  if (view_)
+    view_->Show();
   shark_controller_->StartPairing();
 }
 
 void ControllerPairingScreen::Hide() {
-  if (actor_)
-    actor_->Hide();
+  if (view_)
+    view_->Hide();
 }
 
 void ControllerPairingScreen::PairingStageChanged(Stage new_stage) {
   DCHECK(new_stage != current_stage_);
 
   std::string desired_page;
   switch (new_stage) {
     case ControllerPairingController::STAGE_DEVICES_DISCOVERY: {
       desired_page = kPageDevicesDiscovery;
       context_.SetStringList(kContextKeyDevices, ::login::StringList());
@@ skipping 77 matching lines @@
     device_preselected_ = false;
   } else if (!device_preselected_) {
     selected_device = devices.front();
     device_preselected_ = true;
   }
   context_.SetString(kContextKeySelectedDevice, selected_device);
   context_.SetBoolean(kContextKeyControlsDisabled, selected_device.empty());
   CommitContextChanges();
 }
 
-void ControllerPairingScreen::OnActorDestroyed(
-    ControllerPairingScreenActor* actor) {
-  if (actor_ == actor)
-    actor_ = NULL;
+void ControllerPairingScreen::OnViewDestroyed(
+    ControllerPairingScreenView* view) {
+  if (view_ == view)
+    view_ = nullptr;
 }
 
 // Overridden from ControllerPairingView::Delegate:
 void ControllerPairingScreen::OnUserActed(const std::string& action) {
   if (context_.GetBoolean(kContextKeyControlsDisabled)) {
     LOG(WARNING) << "User acted, but controls are disabled. Ignoring.";
     return;
   }
   bool disable_controls = true;
   if (action == kActionChooseDevice) {
@@ skipping 32 matching lines @@
        ++key) {
     if (*key == kContextKeySelectedDevice) {
       context_.SetBoolean(kContextKeyControlsDisabled,
                           context_.GetString(*key).empty());
       CommitContextChanges();
     }
   }
 }
 
 }  // namespace chromeos