| Index: chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
|
| index c5f4063800081e6334b1a1e4f058922c4775033b..b7a885b4733f3512ee5e64e36348eb7332aecc85 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
|
| @@ -11,7 +11,6 @@
|
| #include "chrome/browser/chromeos/app_mode/kiosk_app_launcher.h"
|
| #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
|
| #include "chrome/browser/chromeos/login/existing_user_controller.h"
|
| -#include "chrome/browser/chromeos/settings/cros_settings.h"
|
| #include "chrome/common/chrome_notification_types.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "content/public/browser/notification_details.h"
|
| @@ -25,11 +24,11 @@ namespace chromeos {
|
|
|
| KioskAppMenuHandler::KioskAppMenuHandler()
|
| : initialized_(false) {
|
| - CrosSettings::Get()->AddSettingsObserver(kKioskApps, this);
|
| + KioskAppManager::Get()->AddObserver(this);
|
| }
|
|
|
| KioskAppMenuHandler::~KioskAppMenuHandler() {
|
| - CrosSettings::Get()->RemoveSettingsObserver(kKioskApps, this);
|
| + KioskAppManager::Get()->RemoveObserver(this);
|
| }
|
|
|
| void KioskAppMenuHandler::GetLocalizedStrings(
|
| @@ -124,13 +123,11 @@ void KioskAppMenuHandler::HandleCheckKioskAppLaunchError(
|
| base::StringValue(error_message));
|
| }
|
|
|
| -void KioskAppMenuHandler::Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) {
|
| - DCHECK_EQ(chrome::NOTIFICATION_SYSTEM_SETTING_CHANGED, type);
|
| - DCHECK_EQ(kKioskApps,
|
| - *content::Details<const std::string>(details).ptr());
|
| +void KioskAppMenuHandler::OnKioskAppsSettingsChanged() {
|
| + SendKioskApps();
|
| +}
|
|
|
| +void KioskAppMenuHandler::OnKioskAppDataChanged(const std::string& app_id) {
|
| SendKioskApps();
|
| }
|
|
|
|
|