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

chrome/browser/chromeos/login/app_launch_controller.cc

Index: chrome/browser/chromeos/login/app_launch_controller.cc
diff --git a/chrome/browser/chromeos/login/app_launch_controller.cc b/chrome/browser/chromeos/login/app_launch_controller.cc
index 9de81cdbdc6470b82e16078060874533c4142437..17584d1e2ad4596823c7d7fa531604622f4ed5d7 100644
--- a/chrome/browser/chromeos/login/app_launch_controller.cc
+++ b/chrome/browser/chromeos/login/app_launch_controller.cc
@@ -151,7 +151,7 @@ AppLaunchController::AppLaunchController(const std::string& app_id,
       host_(host),
       oobe_ui_(oobe_ui),
       app_launch_splash_screen_actor_(
-          oobe_ui_->GetAppLaunchSplashScreenActor()) {}
+          oobe_ui_->GetAppLaunchSplashScreenView()) {}
 
 AppLaunchController::~AppLaunchController() {
   app_launch_splash_screen_actor_->SetDelegate(NULL);
@@ -281,7 +281,7 @@ void AppLaunchController::OnNetworkConfigRequested(bool requested) {
     MaybeShowNetworkConfigureUI();
   } else {
     app_launch_splash_screen_actor_->UpdateAppLaunchState(
-        AppLaunchSplashScreenActor::APP_LAUNCH_STATE_PREPARING_NETWORK);
+        AppLaunchSplashScreenView::APP_LAUNCH_STATE_PREPARING_NETWORK);
     startup_app_launcher_->RestartLauncher();
   }
 }
@@ -387,7 +387,7 @@ void AppLaunchController::MaybeShowNetworkConfigureUI() {
     }
   } else {
     app_launch_splash_screen_actor_->UpdateAppLaunchState(
-        AppLaunchSplashScreenActor::APP_LAUNCH_STATE_NETWORK_WAIT_TIMEOUT);
+        AppLaunchSplashScreenView::APP_LAUNCH_STATE_NETWORK_WAIT_TIMEOUT);
   }
 }
 
@@ -395,7 +395,7 @@ void AppLaunchController::ShowNetworkConfigureUIWhenReady() {
   if (!profile_) {
     show_network_config_ui_after_profile_load_ = true;
     app_launch_splash_screen_actor_->UpdateAppLaunchState(
-        AppLaunchSplashScreenActor::
+        AppLaunchSplashScreenView::
             APP_LAUNCH_STATE_SHOWING_NETWORK_CONFIGURE_UI);
     return;
   }
@@ -415,7 +415,7 @@ void AppLaunchController::InitializeNetwork() {
       this, &AppLaunchController::OnNetworkWaitTimedout);
 
   app_launch_splash_screen_actor_->UpdateAppLaunchState(
-      AppLaunchSplashScreenActor::APP_LAUNCH_STATE_PREPARING_NETWORK);
+      AppLaunchSplashScreenView::APP_LAUNCH_STATE_PREPARING_NETWORK);
 }
 
 bool AppLaunchController::IsNetworkReady() {
@@ -428,17 +428,17 @@ bool AppLaunchController::ShouldSkipAppInstallation() {
 
 void AppLaunchController::OnLoadingOAuthFile() {
   app_launch_splash_screen_actor_->UpdateAppLaunchState(
-      AppLaunchSplashScreenActor::APP_LAUNCH_STATE_LOADING_AUTH_FILE);
+      AppLaunchSplashScreenView::APP_LAUNCH_STATE_LOADING_AUTH_FILE);
 }
 
 void AppLaunchController::OnInitializingTokenService() {
   app_launch_splash_screen_actor_->UpdateAppLaunchState(
-      AppLaunchSplashScreenActor::APP_LAUNCH_STATE_LOADING_TOKEN_SERVICE);
+      AppLaunchSplashScreenView::APP_LAUNCH_STATE_LOADING_TOKEN_SERVICE);
 }
 
 void AppLaunchController::OnInstallingApp() {
   app_launch_splash_screen_actor_->UpdateAppLaunchState(
-      AppLaunchSplashScreenActor::APP_LAUNCH_STATE_INSTALLING_APPLICATION);
+      AppLaunchSplashScreenView::APP_LAUNCH_STATE_INSTALLING_APPLICATION);
 
   ClearNetworkWaitTimer();
   app_launch_splash_screen_actor_->ToggleNetworkConfig(false);
@@ -489,7 +489,7 @@ void AppLaunchController::OnReadyToLaunch() {
 void AppLaunchController::OnLaunchSucceeded() {
   DVLOG(1) << "Kiosk launch succeeded, wait for app window.";
   app_launch_splash_screen_actor_->UpdateAppLaunchState(
-      AppLaunchSplashScreenActor::APP_LAUNCH_STATE_WAITING_APP_WINDOW);
+      AppLaunchSplashScreenView::APP_LAUNCH_STATE_WAITING_APP_WINDOW);
 
   DCHECK(!app_window_watcher_);
   app_window_watcher_.reset(new AppWindowWatcher(this, app_id_));