Clean up when Chrome is terminated and WizardController is in charge of the message loop.

chrome/browser/chromeos/login/wizard_controller.cc

 // Copyright (c) 2010 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/wizard_controller.h"
 
 #include <gdk/gdk.h>
 #include <signal.h>
 #include <sys/types.h>
 
@@ skipping 28 matching lines @@
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/update_screen.h"
 #include "chrome/browser/chromeos/login/user_image_screen.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
+#include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "cros/chromeos_wm_ipc_enums.h"
 #include "unicode/timezone.h"
 #include "views/accelerator.h"
 #include "views/painter.h"
 #include "views/view.h"
 #include "views/widget/widget_gtk.h"
 
 namespace {
 
@@ skipping 200 matching lines @@
 #if defined(OFFICIAL_BUILD)
       is_official_build_(true),
 #else
       is_official_build_(false),
 #endif
       is_out_of_box_(false),
       is_test_mode_(false),
       observer_(NULL) {
   DCHECK(default_controller_ == NULL);
   default_controller_ = this;
+  registrar_.Add(
+      this,
+      NotificationType::APP_TERMINATING,
+      NotificationService::AllSources());
 }
 
 WizardController::~WizardController() {
   // Close ends up deleting the widget.
   if (background_widget_)
     background_widget_->Close();
 
   if (widget_)
     widget_->Close();
 
@@ skipping 227 matching lines @@
   return customization_.get();
 }
 
 void WizardController::SkipRegistration() {
   if (current_screen_ == GetRegistrationScreen())
     OnRegistrationSkipped();
   else
     LOG(ERROR) << "Registration screen is not active.";
 }
 
+void WizardController::Observe(NotificationType type,
+                               const NotificationSource& source,
+                               const NotificationDetails& details) {
+  CHECK(type == NotificationType::APP_TERMINATING);
+
+  MessageLoop::current()->DeleteSoon(FROM_HERE, this);
+  MessageLoop::current()->Quit();
+  registrar_.Remove(this,
+                    NotificationType::APP_TERMINATING,
+                    NotificationService::AllSources());
+}
+
 // static
 void WizardController::RegisterPrefs(PrefService* local_state) {
   local_state->RegisterBooleanPref(kOobeComplete, false);
   local_state->RegisterBooleanPref(kEulaAccepted, false);
   // Check if the pref is already registered in case
   // Preferences::RegisterUserPrefs runs before this code in the future.
   if (local_state->FindPreference(prefs::kAccessibilityEnabled) == NULL) {
     local_state->RegisterBooleanPref(prefs::kAccessibilityEnabled, false);
   }
 }
@@ skipping 493 matching lines @@
     // user has changed to during OOBE.
     if (!timezone_name.empty()) {
       icu::TimeZone* timezone = icu::TimeZone::createTimeZone(
           icu::UnicodeString::fromUTF8(timezone_name));
       chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone);
     }
   }
 }
 
 }  // namespace browser