Index: chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h |
diff --git a/chrome/browser/ui/webui/options/chromeos/kiosk_apps_handler.h b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h |
similarity index 59% |
rename from chrome/browser/ui/webui/options/chromeos/kiosk_apps_handler.h |
rename to chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h |
index cc95f15a352d1f305ce903d2280387b893a27005..5fa4eb9f51eb7256a3968bfeaf354ebe7d96bfd9 100644 |
--- a/chrome/browser/ui/webui/options/chromeos/kiosk_apps_handler.h |
+++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h |
@@ -2,50 +2,55 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_KIOSK_APPS_HANDLER_H_ |
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_KIOSK_APPS_HANDLER_H_ |
+#ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_CHROMEOS_KIOSK_APPS_HANDLER_H_ |
+#define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_CHROMEOS_KIOSK_APPS_HANDLER_H_ |
#include <string> |
+#include "base/compiler_specific.h" |
#include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h" |
-#include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h" |
+#include "content/public/browser/web_ui_message_handler.h" |
namespace base { |
class DictionaryValue; |
class ListValue; |
} |
+namespace content { |
+class WebUIDataSource; |
+} |
+ |
namespace chromeos { |
class KioskAppManager; |
-namespace options { |
- |
-class KioskAppsHandler : public CoreChromeOSOptionsHandler, |
+class KioskAppsHandler : public content::WebUIMessageHandler, |
public KioskAppManagerObserver { |
public: |
KioskAppsHandler(); |
virtual ~KioskAppsHandler(); |
- // options::OptionsPageUIHandler overrides: |
+ void GetLocalizedValues(content::WebUIDataSource* source); |
+ |
+ // content::WebUIMessageHandler overrides: |
virtual void RegisterMessages() OVERRIDE; |
- virtual void GetLocalizedValues( |
- base::DictionaryValue* localized_strings) OVERRIDE; |
// KioskAppPrefsObserver overrides: |
virtual void OnKioskAppDataChanged(const std::string& app_id) OVERRIDE; |
virtual void OnKioskAppDataLoadFailure(const std::string& app_id) OVERRIDE; |
+ virtual void OnKioskAppsSettingsChanged() OVERRIDE; |
private: |
- // Sends all kiosk apps to webui. |
- void SendKioskApps(); |
+ // Sends all kiosk apps and settings to webui. |
+ void SendKioskAppSettings(); |
// JS callbacks. |
- void HandleGetKioskApps(const base::ListValue* args); |
+ void HandleGetKioskAppSettings(const base::ListValue* args); |
void HandleAddKioskApp(const base::ListValue* args); |
void HandleRemoveKioskApp(const base::ListValue* args); |
void HandleEnableKioskAutoLaunch(const base::ListValue* args); |
void HandleDisableKioskAutoLaunch(const base::ListValue* args); |
+ void HandleSetDisableBailoutShortcut(const base::ListValue* args); |
KioskAppManager* kiosk_app_manager_; // not owned. |
bool initialized_; |
@@ -53,7 +58,6 @@ class KioskAppsHandler : public CoreChromeOSOptionsHandler, |
DISALLOW_COPY_AND_ASSIGN(KioskAppsHandler); |
}; |
-} // namespace options |
} // namespace chromeos |
-#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_KIOSK_APPS_HANDLER_H_ |
+#endif // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_CHROMEOS_KIOSK_APPS_HANDLER_H_ |