Remove NOTIFICATION_SYSTEM_SETTING_CHANGED, switch CrosSettings to base::CallbackRegistry.

chrome/browser/chromeos/app_mode/kiosk_app_manager.cc

 // Copyright 2013 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/app_mode/kiosk_app_manager.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_data.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/browser/chromeos/settings/owner_key_util.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 64 matching lines @@
 
 KioskAppManager::App::App() : is_loading(false) {}
 KioskAppManager::App::~App() {}
 
 std::string KioskAppManager::GetAutoLaunchApp() const {
   return auto_launch_app_id_;
 }
 
 void KioskAppManager::SetAutoLaunchApp(const std::string& app_id) {
   SetAutoLoginState(AUTOLOGIN_REQUESTED);
-  // Clean first, so the proper change notifications are triggered even
+  // Clean first, so the proper change callbacks are triggered even
   // if we are only changing AutoLoginState here.
   if (!auto_launch_app_id_.empty()) {
     CrosSettings::Get()->SetString(kAccountsPrefDeviceLocalAccountAutoLoginId,
                                    std::string());
   }
 
   CrosSettings::Get()->SetString(
       kAccountsPrefDeviceLocalAccountAutoLoginId,
       app_id.empty() ? std::string() : GenerateKioskAppAccountId(app_id));
   CrosSettings::Get()->SetInteger(
@@ skipping 193 matching lines @@
 void KioskAppManager::AddObserver(KioskAppManagerObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void KioskAppManager::RemoveObserver(KioskAppManagerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 KioskAppManager::KioskAppManager() : ownership_established_(false) {
   UpdateAppData();
-  CrosSettings::Get()->AddSettingsObserver(
-      kAccountsPrefDeviceLocalAccounts, this);
-  CrosSettings::Get()->AddSettingsObserver(
-      kAccountsPrefDeviceLocalAccountAutoLoginId, this);
+  local_accounts_subscription_ =
+      CrosSettings::Get()->AddSettingsObserver(
+          kAccountsPrefDeviceLocalAccounts,
+          base::Bind(&KioskAppManager::UpdateAppData, base::Unretained(this)));
+  local_account_auto_login_id_subscription_ =
+      CrosSettings::Get()->AddSettingsObserver(
+          kAccountsPrefDeviceLocalAccountAutoLoginId,
+          base::Bind(&KioskAppManager::UpdateAppData, base::Unretained(this)));
 }
 
 KioskAppManager::~KioskAppManager() {}
 
 void KioskAppManager::CleanUp() {
-  CrosSettings::Get()->RemoveSettingsObserver(
-      kAccountsPrefDeviceLocalAccounts, this);
-  CrosSettings::Get()->RemoveSettingsObserver(
-      kAccountsPrefDeviceLocalAccountAutoLoginId, this);
+  local_accounts_subscription_.reset();
+  local_account_auto_login_id_subscription_.reset();
   apps_.clear();
 }
 
 const KioskAppData* KioskAppManager::GetAppData(
     const std::string& app_id) const {
   for (size_t i = 0; i < apps_.size(); ++i) {
     const KioskAppData* data = apps_[i];
     if (data->app_id() == app_id)
       return data;
   }
@@ skipping 47 matching lines @@
     cryptohome::AsyncMethodCaller::GetInstance()->AsyncRemove(
         it->second->user_id(),
         base::Bind(&OnRemoveAppCryptohomeComplete, it->first));
   }
   STLDeleteValues(&old_apps);
 
   FOR_EACH_OBSERVER(KioskAppManagerObserver, observers_,
                     OnKioskAppsSettingsChanged());
 }
 
-void KioskAppManager::Observe(int type,
-                              const content::NotificationSource& source,
-                              const content::NotificationDetails& details) {
-  DCHECK_EQ(chrome::NOTIFICATION_SYSTEM_SETTING_CHANGED, type);
-  UpdateAppData();
-}
-
 void KioskAppManager::GetKioskAppIconCacheDir(base::FilePath* cache_dir) {
   base::FilePath user_data_dir;
   CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
   *cache_dir = user_data_dir.AppendASCII(kIconCacheDir);
 }
 
 void KioskAppManager::OnKioskAppDataChanged(const std::string& app_id) {
   FOR_EACH_OBSERVER(KioskAppManagerObserver,
                     observers_,
                     OnKioskAppDataChanged(app_id));
@@ skipping 19 matching lines @@
 
 void KioskAppManager::SetAutoLoginState(AutoLoginState state) {
   PrefService* prefs = g_browser_process->local_state();
   DictionaryPrefUpdate dict_update(prefs,
                                    KioskAppManager::kKioskDictionaryName);
   dict_update->SetInteger(kKeyAutoLoginState, state);
   prefs->CommitPendingWrite();
 }
 
 }  // namespace chromeos