ScreenObserver is renamed to BaseScreenDelegate.

chrome/browser/chromeos/login/enrollment/enrollment_screen.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/chromeos/login/enrollment/enrollment_screen.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/timer/elapsed_timer.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/screen_manager.h"
-#include "chrome/browser/chromeos/login/screens/screen_observer.h"
+#include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
@@ skipping 16 matching lines @@
   } while (0)
 
 namespace chromeos {
 
 // static
 EnrollmentScreen* EnrollmentScreen::Get(ScreenManager* manager) {
   return static_cast<EnrollmentScreen*>(
       manager->GetScreen(WizardController::kEnrollmentScreenName));
 }
 
-EnrollmentScreen::EnrollmentScreen(ScreenObserver* observer,
+EnrollmentScreen::EnrollmentScreen(BaseScreenDelegate* base_screen_delegate,
                                    EnrollmentScreenActor* actor)
-    : BaseScreen(observer),
+    : BaseScreen(base_screen_delegate),
       shark_controller_(NULL),
       remora_controller_(NULL),
       actor_(actor),
       enrollment_mode_(EnrollmentScreenActor::ENROLLMENT_MODE_MANUAL),
       enrollment_failed_once_(false),
       remora_token_sent_(false),
       weak_ptr_factory_(this) {
   // Init the TPM if it has not been done until now (in debug build we might
   // have not done that yet).
   DBusThreadManager::Get()->GetCryptohomeClient()->TpmCanAttemptOwnership(
@@ skipping 151 matching lines @@
 }
 
 void EnrollmentScreen::OnCancel() {
   UMA(is_auto_enrollment() ? policy::kMetricEnrollmentAutoCancelled
                            : policy::kMetricEnrollmentCancelled);
   if (elapsed_timer_)
     UMA_ENROLLMENT_TIME("Enterprise.EnrollmentTime.Cancel", elapsed_timer_);
   if (enrollment_mode_ == EnrollmentScreenActor::ENROLLMENT_MODE_FORCED ||
       enrollment_mode_ == EnrollmentScreenActor::ENROLLMENT_MODE_RECOVERY) {
     actor_->ResetAuth(
-        base::Bind(&ScreenObserver::OnExit,
-                   base::Unretained(get_screen_observer()),
-                   ScreenObserver::ENTERPRISE_ENROLLMENT_BACK));
+        base::Bind(&BaseScreenDelegate::OnExit,
+                   base::Unretained(get_base_screen_delegate()),
+                   BaseScreenDelegate::ENTERPRISE_ENROLLMENT_BACK));
     return;
   }
 
   if (is_auto_enrollment())
     policy::AutoEnrollmentClient::CancelAutoEnrollment();
   actor_->ResetAuth(
-      base::Bind(&ScreenObserver::OnExit,
-                 base::Unretained(get_screen_observer()),
-                 ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED));
+      base::Bind(&BaseScreenDelegate::OnExit,
+                 base::Unretained(get_base_screen_delegate()),
+                 BaseScreenDelegate::ENTERPRISE_ENROLLMENT_COMPLETED));
 }
 
 void EnrollmentScreen::OnConfirmationClosed() {
   // If the machine has been put in KIOSK mode we have to restart the session
   // here to go in the proper KIOSK mode login screen.
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   if (connector->GetDeviceMode() == policy::DEVICE_MODE_RETAIL_KIOSK) {
     DBusThreadManager::Get()->GetSessionManagerClient()->StopSession();
     return;
   }
 
   if (is_auto_enrollment() &&
       !enrollment_failed_once_ &&
       !user_.empty() &&
       LoginUtils::IsWhitelisted(user_, NULL)) {
     actor_->ShowLoginSpinnerScreen();
-    get_screen_observer()->OnExit(
-        ScreenObserver::ENTERPRISE_AUTO_MAGIC_ENROLLMENT_COMPLETED);
+    get_base_screen_delegate()->OnExit(
+        BaseScreenDelegate::ENTERPRISE_AUTO_MAGIC_ENROLLMENT_COMPLETED);
   } else {
     actor_->ResetAuth(
-        base::Bind(&ScreenObserver::OnExit,
-                   base::Unretained(get_screen_observer()),
-                   ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED));
+        base::Bind(&BaseScreenDelegate::OnExit,
+                   base::Unretained(get_base_screen_delegate()),
+                   BaseScreenDelegate::ENTERPRISE_ENROLLMENT_COMPLETED));
   }
 }
 
 void EnrollmentScreen::RegisterForDevicePolicy(const std::string& token) {
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   if (connector->IsEnterpriseManaged() &&
       connector->GetEnterpriseDomain() != gaia::ExtractDomainName(user_)) {
     LOG(ERROR) << "Trying to re-enroll to a different domain than "
                << connector->GetEnterpriseDomain();
@@ skipping 172 matching lines @@
     sample = policy::kMetricEnrollmentAutoFailed;
   UMA(sample);
 }
 
 void EnrollmentScreen::ShowSigninScreen() {
   actor_->Show();
   actor_->ShowSigninScreen();
 }
 
 }  // namespace chromeos