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

Unified Diff: chrome/chrome_browser_chromeos.gypi

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 | « chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser_chromeos.gypi
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 9bb6b7eb9deec9ab870bd333c638b89e3b112df3..c9d3b51152e4a44c8acc9480d63bf9134d4fc056 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -41,8 +41,6 @@
'browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h',
'browser/chromeos/app_mode/kiosk_profile_loader.cc',
'browser/chromeos/app_mode/kiosk_profile_loader.h',
- 'browser/chromeos/app_mode/kiosk_external_updater.cc',
- 'browser/chromeos/app_mode/kiosk_external_updater.h',
'browser/chromeos/app_mode/startup_app_launcher.cc',
'browser/chromeos/app_mode/startup_app_launcher.h',
'browser/chromeos/attestation/attestation_ca_client.cc',
@@ -407,10 +405,6 @@
'browser/chromeos/input_method/input_method_util.h',
'browser/chromeos/input_method/mode_indicator_controller.cc',
'browser/chromeos/input_method/mode_indicator_controller.h',
- 'browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.cc',
- 'browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h',
- 'browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc',
- 'browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h',
'browser/chromeos/kiosk_mode/kiosk_mode_settings.cc',
'browser/chromeos/kiosk_mode/kiosk_mode_settings.h',
'browser/chromeos/language_preferences.cc',
@@ -928,8 +922,6 @@
'browser/chromeos/ui/idle_logout_dialog_view.h',
'browser/chromeos/ui/inline_login_dialog.cc',
'browser/chromeos/ui/inline_login_dialog.h',
- 'browser/chromeos/ui/kiosk_external_update_notification.cc',
- 'browser/chromeos/ui/kiosk_external_update_notification.h',
'browser/chromeos/ui/mobile_config_ui.cc',
'browser/chromeos/ui/mobile_config_ui.h',
'browser/chromeos/ui/screen_capture_notification_ui_chromeos.cc',
@@ -952,10 +944,18 @@
'browser/supervised_user/chromeos/supervised_user_password_service_factory.h',
],
'browser_chromeos_non_athena_sources': [
+ 'browser/chromeos/app_mode/kiosk_external_updater.cc',
+ 'browser/chromeos/app_mode/kiosk_external_updater.h',
'browser/chromeos/background/ash_user_wallpaper_delegate.cc',
'browser/chromeos/background/ash_user_wallpaper_delegate.h',
+ 'browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.cc',
+ 'browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h',
+ 'browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc',
+ 'browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h',
'browser/chromeos/login/users/wallpaper/wallpaper_manager.cc',
'browser/chromeos/login/users/wallpaper/wallpaper_manager.h',
+ 'browser/chromeos/ui/kiosk_external_update_notification.cc',
+ 'browser/chromeos/ui/kiosk_external_update_notification.h',
],
# These files lists are shared with the GN build.
'browser_chromeos_extension_sources': [
« no previous file with comments | « chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698