Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7311)

Unified Diff: chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h

Issue 14306004: Put Kiosk App parameters into device settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h
diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h
index 10f578531ab61abd5ceabbaccbc3952237cb0a8a..b6f3306984bf9273f67dbfcd91b8fcfb9196e56f 100644
--- a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h
@@ -9,7 +9,7 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
-#include "content/public/browser/notification_observer.h"
+#include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h"
#include "content/public/browser/web_ui_message_handler.h"
namespace chromeos {
@@ -18,7 +18,7 @@ namespace chromeos {
// screen when app mode is enabled and handles "launchKioskApp" request
// from the apps menu.
class KioskAppMenuHandler : public content::WebUIMessageHandler,
- public content::NotificationObserver {
+ public KioskAppManagerObserver {
public:
KioskAppMenuHandler();
virtual ~KioskAppMenuHandler();
@@ -38,10 +38,9 @@ class KioskAppMenuHandler : public content::WebUIMessageHandler,
void HandleLaunchKioskApps(const base::ListValue* args);
void HandleCheckKioskAppLaunchError(const base::ListValue* args);
- // content::NotificationObserver overrides:
- virtual void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) OVERRIDE;
+ // KioskAppManagerObserver overrides:
+ virtual void OnKioskAppsSettingsChanged() OVERRIDE;
+ virtual void OnKioskAppDataChanged(const std::string& app_id) OVERRIDE;
bool initialized_;

Powered by Google App Engine
This is Rietveld 408576698