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

Unified Diff: chrome/browser/chromeos/app_mode/kiosk_app_manager.h

Issue 682183003: Make the kiosk code not depend on Ash in Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash42_accessibility
Patch Set: Created 6 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/app_mode/kiosk_app_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/app_mode/kiosk_app_manager.h
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
index 78a6cb5f90bd754446bbd8901909332d138c3e45..a1006b822d11784dca416b106a2994b3ff0d46f3 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
+++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
@@ -37,7 +37,10 @@ namespace chromeos {
class KioskAppData;
class KioskAppExternalLoader;
class KioskAppManagerObserver;
+
+#if !defined(USE_ATHENA)
class KioskExternalUpdater;
+#endif
// KioskAppManager manages cached app data.
class KioskAppManager : public KioskAppDataDelegate,
@@ -274,7 +277,10 @@ class KioskAppManager : public KioskAppDataDelegate,
local_account_auto_login_id_subscription_;
scoped_ptr<ExternalCache> external_cache_;
+
+#if !defined(USE_ATHENA)
scoped_ptr<KioskExternalUpdater> usb_stick_updater_;
+#endif
// The extension external loader for installing kiosk app.
bool external_loader_created_;
« no previous file with comments | « no previous file | chrome/browser/chromeos/app_mode/kiosk_app_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698