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

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

Issue 2498613003: Add ARC++ kiosk menu items and ability to start kiosk session. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 1 month 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 9bf3939d52236cf8cc6e1bceff824cd721ab8184..ce1e5473701de7dfb55f6daed5809d7efd65a1b0 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
@@ -11,6 +11,7 @@
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
+#include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.h"
#include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
#include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h"
#include "chrome/browser/chromeos/login/screens/network_error.h"
@@ -25,7 +26,8 @@ namespace chromeos {
class KioskAppMenuHandler
: public content::WebUIMessageHandler,
public KioskAppManagerObserver,
- public NetworkStateInformer::NetworkStateInformerObserver {
+ public NetworkStateInformer::NetworkStateInformerObserver,
+ public ArcKioskAppManager::ArcKioskAppManagerObserver {
public:
explicit KioskAppMenuHandler(
const scoped_refptr<NetworkStateInformer>& network_state_informer);
@@ -56,6 +58,9 @@ class KioskAppMenuHandler
// NetworkStateInformer::NetworkStateInformerObserver overrides:
void UpdateState(NetworkError::ErrorReason reason) override;
+ // ArcKioskAppManager::ArcKioskAppManagerObserver overrides:
+ void OnArcKioskAppsChanged() override;
+
// True when WebUI is initialized. Otherwise don't allow calling JS functions.
bool is_webui_initialized_;
« no previous file with comments | « chrome/browser/resources/chromeos/login/apps_menu.js ('k') | chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698