diff options
Diffstat (limited to 'chromium/chrome/chrome_browser_chromeos.gypi')
-rw-r--r-- | chromium/chrome/chrome_browser_chromeos.gypi | 532 |
1 files changed, 336 insertions, 196 deletions
diff --git a/chromium/chrome/chrome_browser_chromeos.gypi b/chromium/chrome/chrome_browser_chromeos.gypi index fab7f80f409..a353ef1ed4c 100644 --- a/chromium/chrome/chrome_browser_chromeos.gypi +++ b/chromium/chrome/chrome_browser_chromeos.gypi @@ -11,7 +11,7 @@ 'variables': { 'conditions': [ ['sysroot!=""', { - 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"', + 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"', }, { 'pkg-config': 'pkg-config' }], @@ -31,21 +31,21 @@ 'chrome_resources.gyp:platform_locale_settings', 'chrome_resources.gyp:theme_resources', 'common', - 'common/extensions/api/api.gyp:api', + 'common/extensions/api/api.gyp:chrome_api', 'common_net', - 'contacts_proto', 'debugger', 'device_policy_proto', 'drive_proto', - 'feedback_proto', 'in_memory_url_index_cache_proto', 'installer_util', + 'safe_browsing_chunk_proto', 'safe_browsing_proto', 'safe_browsing_report_proto', '../breakpad/breakpad.gyp:breakpad_client', '../build/linux/system.gyp:dbus', '../chromeos/chromeos.gyp:chromeos', - '../chromeos/chromeos.gyp:chromeos_memory', + # browser_chromeos #includes signed_secret.pb.h directly. + '../chromeos/chromeos.gyp:cryptohome_signkey_proto', # browser_chromeos #includes power_supply_properties.pb.h directly. '../chromeos/chromeos.gyp:power_manager_proto', '../chromeos/ime/input_method.gyp:gencode', @@ -56,12 +56,13 @@ # transitively via the common target because the proto sources need to # be generated before code in this target can start building. '../components/components.gyp:variations', - '../components/component_strings.gyp:component_strings', + '../components/components_strings.gyp:components_strings', '../content/content.gyp:content_browser', '../content/content.gyp:content_common', '../crypto/crypto.gyp:crypto', '../dbus/dbus.gyp:dbus', '../device/bluetooth/bluetooth.gyp:device_bluetooth', + '../device/hid/hid.gyp:device_hid', '../media/media.gyp:media', '../net/net.gyp:net', '../ppapi/ppapi_internal.gyp:ppapi_ipc', # For PpapiMsg_LoadPlugin @@ -84,17 +85,18 @@ '../third_party/protobuf/protobuf.gyp:protoc#host', '../third_party/re2/re2.gyp:re2', '../third_party/zlib/zlib.gyp:zlib', - '../ui/base/strings/ui_strings.gyp:ui_strings', + '../ui/base/ui_base.gyp:ui_base', + '../ui/display/display.gyp:display', + '../ui/events/events.gyp:dom4_keycode_converter', + '../ui/events/platform/events_platform.gyp:events_platform', '../ui/resources/ui_resources.gyp:ui_resources', + '../ui/strings/ui_strings.gyp:ui_strings', '../ui/surface/surface.gyp:surface', - '../ui/ui.gyp:ui', '../ui/views/controls/webview/webview.gyp:webview', '../ui/views/controls/webview/webview.gyp:webview', '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', '../url/url.gyp:url_lib', '../v8/tools/gyp/v8.gyp:v8', - '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent', - '../webkit/glue/webkit_glue.gyp:glue', '../webkit/storage_browser.gyp:webkit_storage_browser', '../webkit/storage_common.gyp:webkit_storage_common', '../webkit/webkit_resources.gyp:webkit_resources', @@ -109,6 +111,7 @@ ], }, 'export_dependent_settings': [ + 'common/extensions/api/api.gyp:chrome_api', '../sync/sync.gyp:sync', ], 'include_dirs': [ @@ -129,6 +132,8 @@ 'browser/chromeos/app_mode/app_session_lifetime.h', 'browser/chromeos/app_mode/app_launch_utils.cc', 'browser/chromeos/app_mode/app_launch_utils.h', + 'browser/chromeos/app_mode/certificate_manager_dialog.cc', + 'browser/chromeos/app_mode/certificate_manager_dialog.h', 'browser/chromeos/app_mode/kiosk_app_data.cc', 'browser/chromeos/app_mode/kiosk_app_data.h', 'browser/chromeos/app_mode/kiosk_app_data_delegate.h', @@ -139,6 +144,10 @@ 'browser/chromeos/app_mode/kiosk_app_manager_observer.h', 'browser/chromeos/app_mode/kiosk_app_update_service.cc', 'browser/chromeos/app_mode/kiosk_app_update_service.h', + 'browser/chromeos/app_mode/kiosk_diagnosis_runner.cc', + 'browser/chromeos/app_mode/kiosk_diagnosis_runner.h', + 'browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc', + '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/startup_app_launcher.cc', @@ -163,29 +172,18 @@ 'browser/chromeos/boot_times_loader.h', 'browser/chromeos/camera_detector.cc', 'browser/chromeos/camera_detector.h', + 'browser/chromeos/camera_presence_notifier.cc', + 'browser/chromeos/camera_presence_notifier.h', 'browser/chromeos/charger_replace/charger_link_dialog.cc', 'browser/chromeos/charger_replace/charger_link_dialog.h', 'browser/chromeos/charger_replace/charger_replacement_dialog.cc', 'browser/chromeos/charger_replace/charger_replacement_dialog.h', - 'browser/chromeos/choose_mobile_network_dialog.cc', - 'browser/chromeos/choose_mobile_network_dialog.h', 'browser/chromeos/chrome_browser_main_chromeos.cc', 'browser/chromeos/chrome_browser_main_chromeos.h', - 'browser/chromeos/contacts/contact_database.cc', - 'browser/chromeos/contacts/contact_database.h', - 'browser/chromeos/contacts/contact_manager.cc', - 'browser/chromeos/contacts/contact_manager.h', - 'browser/chromeos/contacts/contact_manager_observer.h', - 'browser/chromeos/contacts/contact_map.cc', - 'browser/chromeos/contacts/contact_map.h', - 'browser/chromeos/contacts/contact_store.h', - 'browser/chromeos/contacts/contact_store_observer.h', - 'browser/chromeos/contacts/gdata_contacts_service.cc', - 'browser/chromeos/contacts/gdata_contacts_service.h', - 'browser/chromeos/contacts/google_contact_store.cc', - 'browser/chromeos/contacts/google_contact_store.h', 'browser/chromeos/customization_document.cc', 'browser/chromeos/customization_document.h', + 'browser/chromeos/customization_wallpaper_downloader.cc', + 'browser/chromeos/customization_wallpaper_downloader.h', 'browser/chromeos/display/display_configuration_observer.cc', 'browser/chromeos/display/display_configuration_observer.h', 'browser/chromeos/display/display_preferences.cc', @@ -202,11 +200,13 @@ 'browser/chromeos/dbus/printer_service_provider.h', 'browser/chromeos/dbus/proxy_resolution_service_provider.cc', 'browser/chromeos/dbus/proxy_resolution_service_provider.h', + 'browser/chromeos/dbus/screen_lock_service_provider.cc', + 'browser/chromeos/dbus/screen_lock_service_provider.h', + 'browser/chromeos/device/input_service_proxy.cc', + 'browser/chromeos/device/input_service_proxy.h', 'browser/chromeos/device_hierarchy_observer.h', 'browser/chromeos/device_uma.cc', 'browser/chromeos/device_uma.h', - 'browser/chromeos/drive/async_file_util.cc', - 'browser/chromeos/drive/async_file_util.h', 'browser/chromeos/drive/change_list_loader.cc', 'browser/chromeos/drive/change_list_loader.h', 'browser/chromeos/drive/change_list_loader_observer.h', @@ -214,10 +214,10 @@ 'browser/chromeos/drive/change_list_processor.h', 'browser/chromeos/drive/debug_info_collector.cc', 'browser/chromeos/drive/debug_info_collector.h', + 'browser/chromeos/drive/directory_loader.cc', + 'browser/chromeos/drive/directory_loader.h', 'browser/chromeos/drive/download_handler.cc', 'browser/chromeos/drive/download_handler.h', - 'browser/chromeos/drive/drive_app_registry.cc', - 'browser/chromeos/drive/drive_app_registry.h', 'browser/chromeos/drive/drive_file_stream_reader.cc', 'browser/chromeos/drive/drive_file_stream_reader.h', 'browser/chromeos/drive/drive_integration_service.cc', @@ -257,10 +257,6 @@ 'browser/chromeos/drive/file_system/touch_operation.h', 'browser/chromeos/drive/file_system/truncate_operation.cc', 'browser/chromeos/drive/file_system/truncate_operation.h', - 'browser/chromeos/drive/file_system/update_operation.cc', - 'browser/chromeos/drive/file_system/update_operation.h', - 'browser/chromeos/drive/file_system_backend_delegate.cc', - 'browser/chromeos/drive/file_system_backend_delegate.h', 'browser/chromeos/drive/file_system_interface.h', 'browser/chromeos/drive/file_system_metadata.cc', 'browser/chromeos/drive/file_system_metadata.h', @@ -271,8 +267,16 @@ 'browser/chromeos/drive/file_task_executor.h', 'browser/chromeos/drive/file_write_watcher.cc', 'browser/chromeos/drive/file_write_watcher.h', - 'browser/chromeos/drive/fileapi_worker.cc', - 'browser/chromeos/drive/fileapi_worker.h', + 'browser/chromeos/drive/fileapi/async_file_util.cc', + 'browser/chromeos/drive/fileapi/async_file_util.h', + 'browser/chromeos/drive/fileapi/file_system_backend_delegate.cc', + 'browser/chromeos/drive/fileapi/file_system_backend_delegate.h', + 'browser/chromeos/drive/fileapi/fileapi_worker.cc', + 'browser/chromeos/drive/fileapi/fileapi_worker.h', + 'browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.cc', + 'browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h', + 'browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.cc', + 'browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.h', 'browser/chromeos/drive/job_list.cc', 'browser/chromeos/drive/job_list.h', 'browser/chromeos/drive/job_queue.cc', @@ -281,8 +285,6 @@ 'browser/chromeos/drive/job_scheduler.h', 'browser/chromeos/drive/local_file_reader.cc', 'browser/chromeos/drive/local_file_reader.h', - 'browser/chromeos/drive/logging.cc', - 'browser/chromeos/drive/logging.h', 'browser/chromeos/drive/remove_stale_cache_files.cc', 'browser/chromeos/drive/remove_stale_cache_files.h', 'browser/chromeos/drive/resource_entry_conversion.cc', @@ -301,14 +303,20 @@ 'browser/chromeos/drive/sync/remove_performer.h', 'browser/chromeos/drive/sync_client.cc', 'browser/chromeos/drive/sync_client.h', - 'browser/chromeos/drive/webkit_file_stream_reader_impl.cc', - 'browser/chromeos/drive/webkit_file_stream_reader_impl.h', - 'browser/chromeos/drive/webkit_file_stream_writer_impl.cc', - 'browser/chromeos/drive/webkit_file_stream_writer_impl.h', 'browser/chromeos/drive/write_on_cache_file.cc', 'browser/chromeos/drive/write_on_cache_file.h', 'browser/chromeos/enrollment_dialog_view.cc', 'browser/chromeos/enrollment_dialog_view.h', + 'browser/chromeos/events/event_rewriter.cc', + 'browser/chromeos/events/event_rewriter.h', + 'browser/chromeos/events/event_rewriter_controller.cc', + 'browser/chromeos/events/event_rewriter_controller.h', + 'browser/chromeos/events/keyboard_driven_event_rewriter.cc', + 'browser/chromeos/events/keyboard_driven_event_rewriter.h', + 'browser/chromeos/events/system_key_event_listener.cc', + 'browser/chromeos/events/system_key_event_listener.h', + 'browser/chromeos/events/xinput_hierarchy_changed_event_listener.cc', + 'browser/chromeos/events/xinput_hierarchy_changed_event_listener.h', 'browser/chromeos/extensions/default_app_order.cc', 'browser/chromeos/extensions/default_app_order.h', 'browser/chromeos/extensions/device_local_account_external_policy_loader.cc', @@ -321,8 +329,6 @@ 'browser/chromeos/extensions/extension_system_event_observer.h', 'browser/chromeos/extensions/external_cache.cc', 'browser/chromeos/extensions/external_cache.h', - 'browser/chromeos/extensions/external_pref_cache_loader.cc', - 'browser/chromeos/extensions/external_pref_cache_loader.h', 'browser/chromeos/extensions/info_private_api.cc', 'browser/chromeos/extensions/info_private_api.h', 'browser/chromeos/extensions/input_method_event_router.cc', @@ -340,8 +346,6 @@ 'browser/chromeos/file_manager/app_id.h', 'browser/chromeos/file_manager/app_installer.cc', 'browser/chromeos/file_manager/app_installer.h', - 'browser/chromeos/file_manager/desktop_notifications.cc', - 'browser/chromeos/file_manager/desktop_notifications.h', 'browser/chromeos/file_manager/file_browser_handlers.cc', 'browser/chromeos/file_manager/file_browser_handlers.h', 'browser/chromeos/file_manager/file_tasks.cc', @@ -350,6 +354,8 @@ 'browser/chromeos/file_manager/file_watcher.h', 'browser/chromeos/file_manager/fileapi_util.cc', 'browser/chromeos/file_manager/fileapi_util.h', + 'browser/chromeos/file_manager/filesystem_api_util.cc', + 'browser/chromeos/file_manager/filesystem_api_util.h', 'browser/chromeos/file_manager/mime_util.cc', 'browser/chromeos/file_manager/mime_util.h', 'browser/chromeos/file_manager/mounted_disk_monitor.cc', @@ -362,6 +368,8 @@ 'browser/chromeos/file_manager/path_util.h', 'browser/chromeos/file_manager/select_file_dialog_util.cc', 'browser/chromeos/file_manager/select_file_dialog_util.h', + 'browser/chromeos/file_manager/snapshot_manager.cc', + 'browser/chromeos/file_manager/snapshot_manager.h', 'browser/chromeos/file_manager/url_util.cc', 'browser/chromeos/file_manager/url_util.h', 'browser/chromeos/file_manager/volume_manager.cc', @@ -371,11 +379,49 @@ 'browser/chromeos/file_manager/volume_manager_observer.h', 'browser/chromeos/file_manager/zip_file_creator.cc', 'browser/chromeos/file_manager/zip_file_creator.h', + 'browser/chromeos/file_system_provider/fileapi/backend_delegate.cc', + 'browser/chromeos/file_system_provider/fileapi/backend_delegate.h', + 'browser/chromeos/file_system_provider/fileapi/file_stream_reader.cc', + 'browser/chromeos/file_system_provider/fileapi/file_stream_reader.h', + 'browser/chromeos/file_system_provider/fileapi/provider_async_file_util.cc', + 'browser/chromeos/file_system_provider/fileapi/provider_async_file_util.h', + 'browser/chromeos/file_system_provider/mount_path_util.cc', + 'browser/chromeos/file_system_provider/mount_path_util.h', + 'browser/chromeos/file_system_provider/observer.h', + 'browser/chromeos/file_system_provider/operations/close_file.cc', + 'browser/chromeos/file_system_provider/operations/close_file.h', + 'browser/chromeos/file_system_provider/operations/get_metadata.cc', + 'browser/chromeos/file_system_provider/operations/get_metadata.h', + 'browser/chromeos/file_system_provider/operations/open_file.cc', + 'browser/chromeos/file_system_provider/operations/open_file.h', + 'browser/chromeos/file_system_provider/operations/operation.cc', + 'browser/chromeos/file_system_provider/operations/operation.h', + 'browser/chromeos/file_system_provider/operations/read_directory.cc', + 'browser/chromeos/file_system_provider/operations/read_directory.h', + 'browser/chromeos/file_system_provider/operations/read_file.cc', + 'browser/chromeos/file_system_provider/operations/read_file.h', + 'browser/chromeos/file_system_provider/operations/unmount.cc', + 'browser/chromeos/file_system_provider/operations/unmount.h', + 'browser/chromeos/file_system_provider/provided_file_system.cc', + 'browser/chromeos/file_system_provider/provided_file_system.h', + 'browser/chromeos/file_system_provider/provided_file_system_info.cc', + 'browser/chromeos/file_system_provider/provided_file_system_info.h', + 'browser/chromeos/file_system_provider/provided_file_system_interface.h', + 'browser/chromeos/file_system_provider/request_manager.cc', + 'browser/chromeos/file_system_provider/request_manager.h', + 'browser/chromeos/file_system_provider/request_value.cc', + 'browser/chromeos/file_system_provider/request_value.h', + 'browser/chromeos/file_system_provider/service.cc', + 'browser/chromeos/file_system_provider/service.h', + 'browser/chromeos/file_system_provider/service_factory.cc', + 'browser/chromeos/file_system_provider/service_factory.h', 'browser/chromeos/fileapi/file_access_permissions.cc', 'browser/chromeos/fileapi/file_access_permissions.h', 'browser/chromeos/fileapi/file_system_backend.cc', 'browser/chromeos/fileapi/file_system_backend.h', 'browser/chromeos/fileapi/file_system_backend_delegate.h', + 'browser/chromeos/fileapi/mtp_file_system_backend_delegate.cc', + 'browser/chromeos/fileapi/mtp_file_system_backend_delegate.h', 'browser/chromeos/first_run/drive_first_run_controller.cc', 'browser/chromeos/first_run/drive_first_run_controller.h', 'browser/chromeos/first_run/first_run.cc', @@ -395,6 +441,14 @@ 'browser/chromeos/first_run/steps/tray_step.cc', 'browser/chromeos/first_run/steps/tray_step.h', 'browser/chromeos/genius_app/app_id.h', + 'browser/chromeos/geolocation/geoposition.cc', + 'browser/chromeos/geolocation/geoposition.h', + 'browser/chromeos/geolocation/simple_geolocation_provider.cc', + 'browser/chromeos/geolocation/simple_geolocation_provider.h', + 'browser/chromeos/geolocation/simple_geolocation_request.cc', + 'browser/chromeos/geolocation/simple_geolocation_request.h', + 'browser/chromeos/idle_detector.cc', + 'browser/chromeos/idle_detector.h', 'browser/chromeos/imageburner/burn_controller.cc', 'browser/chromeos/imageburner/burn_controller.h', 'browser/chromeos/imageburner/burn_device_handler.cc', @@ -409,20 +463,14 @@ 'browser/chromeos/input_method/candidate_window_controller.h', 'browser/chromeos/input_method/candidate_window_controller_impl.cc', 'browser/chromeos/input_method/candidate_window_controller_impl.h', - 'browser/chromeos/input_method/candidate_window_view.cc', - 'browser/chromeos/input_method/candidate_window_view.h', - 'browser/chromeos/input_method/delayable_widget.cc', - 'browser/chromeos/input_method/delayable_widget.h', - 'browser/chromeos/input_method/hidable_area.cc', - 'browser/chromeos/input_method/hidable_area.h', - 'browser/chromeos/input_method/infolist_window_view.cc', - 'browser/chromeos/input_method/infolist_window_view.h', - 'browser/chromeos/input_method/input_method_engine.cc', - 'browser/chromeos/input_method/input_method_engine.h', + 'browser/chromeos/input_method/component_extension_ime_manager_impl.cc', + 'browser/chromeos/input_method/component_extension_ime_manager_impl.h', 'browser/chromeos/input_method/input_method_configuration.cc', 'browser/chromeos/input_method/input_method_configuration.h', 'browser/chromeos/input_method/input_method_delegate_impl.cc', 'browser/chromeos/input_method/input_method_delegate_impl.h', + 'browser/chromeos/input_method/input_method_engine.cc', + 'browser/chromeos/input_method/input_method_engine.h', 'browser/chromeos/input_method/input_method_engine_interface.cc', 'browser/chromeos/input_method/input_method_engine_interface.h', 'browser/chromeos/input_method/input_method_manager_impl.cc', @@ -431,14 +479,8 @@ 'browser/chromeos/input_method/input_method_persistence.h', 'browser/chromeos/input_method/input_method_util.cc', 'browser/chromeos/input_method/input_method_util.h', - 'browser/chromeos/input_method/component_extension_ime_manager_impl.cc', - 'browser/chromeos/input_method/component_extension_ime_manager_impl.h', 'browser/chromeos/input_method/mode_indicator_controller.cc', 'browser/chromeos/input_method/mode_indicator_controller.h', - 'browser/chromeos/input_method/mode_indicator_delegate_view.cc', - 'browser/chromeos/input_method/mode_indicator_delegate_view.h', - 'browser/chromeos/keyboard_driven_event_rewriter.cc', - 'browser/chromeos/keyboard_driven_event_rewriter.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', @@ -453,38 +495,53 @@ 'browser/chromeos/login/app_launch_controller.h', 'browser/chromeos/login/app_launch_signin_screen.cc', 'browser/chromeos/login/app_launch_signin_screen.h', - 'browser/chromeos/login/auth_attempt_state.cc', - 'browser/chromeos/login/auth_attempt_state.h', - 'browser/chromeos/login/auth_attempt_state_resolver.cc', - 'browser/chromeos/login/auth_attempt_state_resolver.h', - 'browser/chromeos/login/auth_prewarmer.cc', - 'browser/chromeos/login/auth_prewarmer.h', - 'browser/chromeos/login/auth_sync_observer.cc', - 'browser/chromeos/login/auth_sync_observer.h', - 'browser/chromeos/login/auth_sync_observer_factory.cc', - 'browser/chromeos/login/auth_sync_observer_factory.h', + 'browser/chromeos/login/auth/auth_attempt_state.cc', + 'browser/chromeos/login/auth/auth_attempt_state.h', + 'browser/chromeos/login/auth/auth_attempt_state_resolver.cc', + 'browser/chromeos/login/auth/auth_attempt_state_resolver.h', + 'browser/chromeos/login/auth/auth_prewarmer.cc', + 'browser/chromeos/login/auth/auth_prewarmer.h', + 'browser/chromeos/login/auth/authenticator.cc', + 'browser/chromeos/login/auth/authenticator.h', + 'browser/chromeos/login/auth/extended_authenticator.cc', + 'browser/chromeos/login/auth/extended_authenticator.h', + 'browser/chromeos/login/auth/key.cc', + 'browser/chromeos/login/auth/key.h', + 'browser/chromeos/login/auth/login_performer.cc', + 'browser/chromeos/login/auth/login_performer.h', + 'browser/chromeos/login/auth/login_status_consumer.cc', + 'browser/chromeos/login/auth/login_status_consumer.h', + 'browser/chromeos/login/auth/mount_manager.cc', + 'browser/chromeos/login/auth/mount_manager.h', + 'browser/chromeos/login/auth/online_attempt.cc', + 'browser/chromeos/login/auth/online_attempt.h', + 'browser/chromeos/login/auth/online_attempt_host.cc', + 'browser/chromeos/login/auth/online_attempt_host.h', + 'browser/chromeos/login/auth/parallel_authenticator.cc', + 'browser/chromeos/login/auth/parallel_authenticator.h', + 'browser/chromeos/login/auth/test_attempt_state.cc', + 'browser/chromeos/login/auth/test_attempt_state.h', + 'browser/chromeos/login/auth/tpm_password_fetcher.cc', + 'browser/chromeos/login/auth/tpm_password_fetcher.h', + 'browser/chromeos/login/auth/user_context.cc', + 'browser/chromeos/login/auth/user_context.h', 'browser/chromeos/login/authentication_notification_details.h', - 'browser/chromeos/login/authenticator.cc', - 'browser/chromeos/login/authenticator.h', - 'browser/chromeos/login/captive_portal_view.cc', - 'browser/chromeos/login/captive_portal_view.h', - 'browser/chromeos/login/captive_portal_window_proxy.cc', - 'browser/chromeos/login/captive_portal_window_proxy.h', 'browser/chromeos/login/chrome_restart_request.cc', 'browser/chromeos/login/chrome_restart_request.h', 'browser/chromeos/login/default_pinned_apps_field_trial.cc', 'browser/chromeos/login/default_pinned_apps_field_trial.h', - 'browser/chromeos/login/default_user_images.cc', - 'browser/chromeos/login/default_user_images.h', + 'browser/chromeos/login/demo_mode/demo_app_launcher.cc', + 'browser/chromeos/login/demo_mode/demo_app_launcher.h', + 'browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc', + 'browser/chromeos/login/enrollment/auto_enrollment_check_screen.h', + 'browser/chromeos/login/enrollment/auto_enrollment_check_screen_actor.h', + 'browser/chromeos/login/enrollment/auto_enrollment_controller.cc', + 'browser/chromeos/login/enrollment/auto_enrollment_controller.h', 'browser/chromeos/login/enrollment/enrollment_screen.cc', 'browser/chromeos/login/enrollment/enrollment_screen.h', 'browser/chromeos/login/enrollment/enrollment_screen_actor.h', 'browser/chromeos/login/existing_user_controller.cc', 'browser/chromeos/login/existing_user_controller.h', - 'browser/chromeos/login/input_events_blocker.h', - 'browser/chromeos/login/input_events_blocker.cc', - 'browser/chromeos/login/keyboard_driven_oobe_key_handler.cc', - 'browser/chromeos/login/keyboard_driven_oobe_key_handler.h', 'browser/chromeos/login/help_app_launcher.cc', 'browser/chromeos/login/help_app_launcher.h', 'browser/chromeos/login/helper.cc', @@ -493,71 +550,40 @@ 'browser/chromeos/login/hwid_checker.h', 'browser/chromeos/login/language_list.cc', 'browser/chromeos/login/language_list.h', - 'browser/chromeos/login/lock_window.cc', - 'browser/chromeos/login/lock_window.h', - 'browser/chromeos/login/lock_window_aura.cc', - 'browser/chromeos/login/lock_window_aura.h', - 'browser/chromeos/login/login_display.cc', - 'browser/chromeos/login/login_display.h', - 'browser/chromeos/login/login_display_host.h', - 'browser/chromeos/login/login_display_host_impl.cc', - 'browser/chromeos/login/login_display_host_impl.h', - 'browser/chromeos/login/login_performer.cc', - 'browser/chromeos/login/login_performer.h', - 'browser/chromeos/login/login_status_consumer.cc', - 'browser/chromeos/login/login_status_consumer.h', + 'browser/chromeos/login/lock/screen_locker.cc', + 'browser/chromeos/login/lock/screen_locker.h', + 'browser/chromeos/login/lock/screen_locker_delegate.cc', + 'browser/chromeos/login/lock/screen_locker_delegate.h', + 'browser/chromeos/login/lock/webui_screen_locker.cc', + 'browser/chromeos/login/lock/webui_screen_locker.h', 'browser/chromeos/login/login_utils.cc', 'browser/chromeos/login/login_utils.h', - 'browser/chromeos/login/login_web_dialog.cc', - 'browser/chromeos/login/login_web_dialog.h', 'browser/chromeos/login/login_wizard.h', 'browser/chromeos/login/managed/locally_managed_user_constants.cc', 'browser/chromeos/login/managed/locally_managed_user_constants.h', - 'browser/chromeos/login/managed/locally_managed_user_creation_controller.cc', - 'browser/chromeos/login/managed/locally_managed_user_creation_controller.h', 'browser/chromeos/login/managed/locally_managed_user_creation_flow.cc', 'browser/chromeos/login/managed/locally_managed_user_creation_flow.h', 'browser/chromeos/login/managed/locally_managed_user_creation_screen.cc', 'browser/chromeos/login/managed/locally_managed_user_creation_screen.h', - 'browser/chromeos/login/managed/locally_managed_user_login_flow.cc', - 'browser/chromeos/login/managed/locally_managed_user_login_flow.h', 'browser/chromeos/login/managed/managed_user_authenticator.cc', 'browser/chromeos/login/managed/managed_user_authenticator.h', - 'browser/chromeos/login/merge_session_load_page.cc', - 'browser/chromeos/login/merge_session_load_page.h', - 'browser/chromeos/login/merge_session_throttle.cc', - 'browser/chromeos/login/merge_session_throttle.h', - 'browser/chromeos/login/mount_manager.cc', - 'browser/chromeos/login/mount_manager.h', - 'browser/chromeos/login/multi_profile_first_run_notification.cc', - 'browser/chromeos/login/multi_profile_first_run_notification.h', - 'browser/chromeos/login/multi_profile_user_controller.cc', - 'browser/chromeos/login/multi_profile_user_controller.h', - 'browser/chromeos/login/multi_profile_user_controller_delegate.h', - 'browser/chromeos/login/oauth2_login_manager.cc', - 'browser/chromeos/login/oauth2_login_manager.h', - 'browser/chromeos/login/oauth2_login_manager_factory.cc', - 'browser/chromeos/login/oauth2_login_manager_factory.h', - 'browser/chromeos/login/oauth2_login_verifier.cc', - 'browser/chromeos/login/oauth2_login_verifier.h', - 'browser/chromeos/login/oauth2_token_fetcher.cc', - 'browser/chromeos/login/oauth2_token_fetcher.h', - 'browser/chromeos/login/online_attempt.cc', - 'browser/chromeos/login/online_attempt.h', - 'browser/chromeos/login/online_attempt_host.cc', - 'browser/chromeos/login/online_attempt_host.h', - 'browser/chromeos/login/oobe_display.h', - 'browser/chromeos/login/parallel_authenticator.cc', - 'browser/chromeos/login/parallel_authenticator.h', + 'browser/chromeos/login/managed/managed_user_creation_controller.cc', + 'browser/chromeos/login/managed/managed_user_creation_controller.h', + 'browser/chromeos/login/managed/managed_user_creation_controller_new.cc', + 'browser/chromeos/login/managed/managed_user_creation_controller_new.h', + 'browser/chromeos/login/managed/managed_user_creation_controller_old.cc', + 'browser/chromeos/login/managed/managed_user_creation_controller_old.h', + 'browser/chromeos/login/managed/supervised_user_authentication.cc', + 'browser/chromeos/login/managed/supervised_user_authentication.h', + 'browser/chromeos/login/managed/supervised_user_login_flow.cc', + 'browser/chromeos/login/managed/supervised_user_login_flow.h', 'browser/chromeos/login/profile_auth_data.cc', 'browser/chromeos/login/profile_auth_data.h', - 'browser/chromeos/login/proxy_settings_dialog.cc', 'browser/chromeos/login/proxy_settings_dialog.h', - 'browser/chromeos/login/remove_user_delegate.h', - 'browser/chromeos/login/screen_locker.cc', - 'browser/chromeos/login/screen_locker.h', - 'browser/chromeos/login/screen_locker_delegate.cc', - 'browser/chromeos/login/screen_locker_delegate.h', + 'browser/chromeos/login/saml/saml_offline_signin_limiter.cc', + 'browser/chromeos/login/saml/saml_offline_signin_limiter.h', + 'browser/chromeos/login/saml/saml_offline_signin_limiter_factory.cc', + 'browser/chromeos/login/saml/saml_offline_signin_limiter_factory.h', 'browser/chromeos/login/screens/base_screen.cc', 'browser/chromeos/login/screens/base_screen.h', 'browser/chromeos/login/screens/core_oobe_actor.h', @@ -565,9 +591,15 @@ 'browser/chromeos/login/screens/error_screen.h', 'browser/chromeos/login/screens/error_screen_actor.cc', 'browser/chromeos/login/screens/error_screen_actor.h', + 'browser/chromeos/login/screens/error_screen_actor_delegate.h', 'browser/chromeos/login/screens/eula_screen.cc', 'browser/chromeos/login/screens/eula_screen.h', 'browser/chromeos/login/screens/eula_screen_actor.h', + 'browser/chromeos/login/screens/gaia_screen.cc', + 'browser/chromeos/login/screens/gaia_screen.h', + 'browser/chromeos/login/screens/hid_detection_screen.cc', + 'browser/chromeos/login/screens/hid_detection_screen.h', + 'browser/chromeos/login/screens/hid_detection_screen_actor.h', 'browser/chromeos/login/screens/kiosk_autolaunch_screen.cc', 'browser/chromeos/login/screens/kiosk_autolaunch_screen.h', 'browser/chromeos/login/screens/kiosk_autolaunch_screen_actor.h', @@ -597,72 +629,123 @@ 'browser/chromeos/login/screens/user_image_screen.cc', 'browser/chromeos/login/screens/user_image_screen.h', 'browser/chromeos/login/screens/user_image_screen_actor.h', + 'browser/chromeos/login/screens/user_selection_screen.cc', + 'browser/chromeos/login/screens/user_selection_screen.h', 'browser/chromeos/login/screens/wizard_screen.cc', 'browser/chromeos/login/screens/wizard_screen.h', 'browser/chromeos/login/screens/wrong_hwid_screen.cc', 'browser/chromeos/login/screens/wrong_hwid_screen.h', 'browser/chromeos/login/screens/wrong_hwid_screen_actor.h', - 'browser/chromeos/login/simple_web_view_dialog.cc', - 'browser/chromeos/login/simple_web_view_dialog.h', + 'browser/chromeos/login/session/session_manager.cc', + 'browser/chromeos/login/session/session_manager.h', + 'browser/chromeos/login/signin/auth_sync_observer.cc', + 'browser/chromeos/login/signin/auth_sync_observer.h', + 'browser/chromeos/login/signin/auth_sync_observer_factory.cc', + 'browser/chromeos/login/signin/auth_sync_observer_factory.h', + 'browser/chromeos/login/signin/merge_session_load_page.cc', + 'browser/chromeos/login/signin/merge_session_load_page.h', + 'browser/chromeos/login/signin/merge_session_throttle.cc', + 'browser/chromeos/login/signin/merge_session_throttle.h', + 'browser/chromeos/login/signin/merge_session_xhr_request_waiter.cc', + 'browser/chromeos/login/signin/merge_session_xhr_request_waiter.h', + 'browser/chromeos/login/signin/oauth2_login_manager.cc', + 'browser/chromeos/login/signin/oauth2_login_manager.h', + 'browser/chromeos/login/signin/oauth2_login_manager_factory.cc', + 'browser/chromeos/login/signin/oauth2_login_manager_factory.h', + 'browser/chromeos/login/signin/oauth2_login_verifier.cc', + 'browser/chromeos/login/signin/oauth2_login_verifier.h', + 'browser/chromeos/login/signin/oauth2_token_fetcher.cc', + 'browser/chromeos/login/signin/oauth2_token_fetcher.h', 'browser/chromeos/login/startup_utils.cc', 'browser/chromeos/login/startup_utils.h', - 'browser/chromeos/login/supervised_user_manager.h', - 'browser/chromeos/login/supervised_user_manager_impl.cc', - 'browser/chromeos/login/supervised_user_manager_impl.h', - 'browser/chromeos/login/test_attempt_state.cc', - 'browser/chromeos/login/test_attempt_state.h', - 'browser/chromeos/login/tpm_password_fetcher.cc', - 'browser/chromeos/login/tpm_password_fetcher.h', - 'browser/chromeos/login/user.cc', - 'browser/chromeos/login/user.h', - 'browser/chromeos/login/user_adding_screen.cc', - 'browser/chromeos/login/user_adding_screen.h', + 'browser/chromeos/login/ui/captive_portal_view.cc', + 'browser/chromeos/login/ui/captive_portal_view.h', + 'browser/chromeos/login/ui/captive_portal_window_proxy.cc', + 'browser/chromeos/login/ui/captive_portal_window_proxy.h', + 'browser/chromeos/login/ui/input_events_blocker.cc', + 'browser/chromeos/login/ui/input_events_blocker.h', + 'browser/chromeos/login/ui/keyboard_driven_oobe_key_handler.cc', + 'browser/chromeos/login/ui/keyboard_driven_oobe_key_handler.h', + 'browser/chromeos/login/ui/lock_window.cc', + 'browser/chromeos/login/ui/lock_window.h', + 'browser/chromeos/login/ui/lock_window_aura.cc', + 'browser/chromeos/login/ui/lock_window_aura.h', + 'browser/chromeos/login/ui/login_display.cc', + 'browser/chromeos/login/ui/login_display.h', + 'browser/chromeos/login/ui/login_display_host.h', + 'browser/chromeos/login/ui/login_display_host_impl.cc', + 'browser/chromeos/login/ui/login_display_host_impl.h', + 'browser/chromeos/login/ui/login_web_dialog.cc', + 'browser/chromeos/login/ui/login_web_dialog.h', + 'browser/chromeos/login/ui/oobe_display.h', + 'browser/chromeos/login/ui/proxy_settings_dialog.cc', + 'browser/chromeos/login/ui/simple_web_view_dialog.cc', + 'browser/chromeos/login/ui/simple_web_view_dialog.h', + 'browser/chromeos/login/ui/user_adding_screen.cc', + 'browser/chromeos/login/ui/user_adding_screen.h', + 'browser/chromeos/login/ui/webui_login_display.cc', + 'browser/chromeos/login/ui/webui_login_display.h', + 'browser/chromeos/login/ui/webui_login_view.cc', + 'browser/chromeos/login/ui/webui_login_view.h', 'browser/chromeos/login/user_flow.cc', 'browser/chromeos/login/user_flow.h', - 'browser/chromeos/login/user_image.cc', - 'browser/chromeos/login/user_image.h', - 'browser/chromeos/login/user_image_loader.cc', - 'browser/chromeos/login/user_image_loader.h', - 'browser/chromeos/login/user_image_manager.cc', - 'browser/chromeos/login/user_image_manager.h', - 'browser/chromeos/login/user_image_manager_impl.cc', - 'browser/chromeos/login/user_image_manager_impl.h', - 'browser/chromeos/login/user_image_sync_observer.cc', - 'browser/chromeos/login/user_image_sync_observer.h', - 'browser/chromeos/login/user_manager.cc', - 'browser/chromeos/login/user_manager.h', - 'browser/chromeos/login/user_manager_impl.cc', - 'browser/chromeos/login/user_manager_impl.h', + 'browser/chromeos/login/users/avatar/default_user_images.cc', + 'browser/chromeos/login/users/avatar/default_user_images.h', + 'browser/chromeos/login/users/avatar/user_image.cc', + 'browser/chromeos/login/users/avatar/user_image.h', + 'browser/chromeos/login/users/avatar/user_image_loader.cc', + 'browser/chromeos/login/users/avatar/user_image_loader.h', + 'browser/chromeos/login/users/avatar/user_image_manager.cc', + 'browser/chromeos/login/users/avatar/user_image_manager.h', + 'browser/chromeos/login/users/avatar/user_image_manager_impl.cc', + 'browser/chromeos/login/users/avatar/user_image_manager_impl.h', + 'browser/chromeos/login/users/avatar/user_image_sync_observer.cc', + 'browser/chromeos/login/users/avatar/user_image_sync_observer.h', + 'browser/chromeos/login/users/multi_profile_user_controller.cc', + 'browser/chromeos/login/users/multi_profile_user_controller.h', + 'browser/chromeos/login/users/multi_profile_user_controller_delegate.h', + 'browser/chromeos/login/users/remove_user_delegate.h', + 'browser/chromeos/login/users/supervised_user_manager.h', + 'browser/chromeos/login/users/supervised_user_manager_impl.cc', + 'browser/chromeos/login/users/supervised_user_manager_impl.h', + 'browser/chromeos/login/users/user_manager.cc', + 'browser/chromeos/login/users/user_manager.h', + 'browser/chromeos/login/users/user_manager_impl.cc', + 'browser/chromeos/login/users/user_manager_impl.h', + 'browser/chromeos/login/users/user.cc', + 'browser/chromeos/login/users/user.h', + 'browser/chromeos/login/users/wallpaper/wallpaper_manager.cc', + 'browser/chromeos/login/users/wallpaper/wallpaper_manager.h', 'browser/chromeos/login/version_info_updater.cc', 'browser/chromeos/login/version_info_updater.h', - 'browser/chromeos/login/wallpaper_manager.cc', - 'browser/chromeos/login/wallpaper_manager.h', - 'browser/chromeos/login/webui_login_display.cc', - 'browser/chromeos/login/webui_login_display.h', - 'browser/chromeos/login/webui_login_view.cc', - 'browser/chromeos/login/webui_login_view.h', - 'browser/chromeos/login/webui_screen_locker.cc', - 'browser/chromeos/login/webui_screen_locker.h', 'browser/chromeos/login/wizard_controller.cc', 'browser/chromeos/login/wizard_controller.h', + 'browser/chromeos/memory/low_memory_observer.cc', + 'browser/chromeos/memory/low_memory_observer.h', 'browser/chromeos/memory/oom_priority_manager.cc', 'browser/chromeos/memory/oom_priority_manager.h', 'browser/chromeos/mobile/mobile_activator.cc', 'browser/chromeos/mobile/mobile_activator.h', 'browser/chromeos/mobile_config.cc', 'browser/chromeos/mobile_config.h', + 'browser/chromeos/net/cert_verify_proc_chromeos.cc', + 'browser/chromeos/net/cert_verify_proc_chromeos.h', + 'browser/chromeos/net/delay_network_call.cc', + 'browser/chromeos/net/delay_network_call.h', 'browser/chromeos/net/network_portal_detector.cc', 'browser/chromeos/net/network_portal_detector.h', 'browser/chromeos/net/network_portal_detector_impl.cc', 'browser/chromeos/net/network_portal_detector_impl.h', + 'browser/chromeos/net/network_portal_detector_strategy.cc', + 'browser/chromeos/net/network_portal_detector_strategy.h', 'browser/chromeos/net/network_portal_detector_test_impl.cc', 'browser/chromeos/net/network_portal_detector_test_impl.h', + 'browser/chromeos/net/network_portal_notification_controller.cc', + 'browser/chromeos/net/network_portal_notification_controller.h', 'browser/chromeos/net/onc_utils.cc', 'browser/chromeos/net/onc_utils.h', 'browser/chromeos/net/proxy_config_handler.cc', 'browser/chromeos/net/proxy_config_handler.h', - 'browser/chromeos/notifications/balloon_view_host_chromeos.cc', - 'browser/chromeos/notifications/balloon_view_host_chromeos.h', 'browser/chromeos/offline/offline_load_page.cc', 'browser/chromeos/offline/offline_load_page.h', 'browser/chromeos/options/cert_library.cc', @@ -679,10 +762,22 @@ 'browser/chromeos/options/wifi_config_view.h', 'browser/chromeos/options/wimax_config_view.cc', 'browser/chromeos/options/wimax_config_view.h', + 'browser/chromeos/ownership/owner_settings_service.cc', + 'browser/chromeos/ownership/owner_settings_service.h', + 'browser/chromeos/ownership/owner_settings_service_factory.cc', + 'browser/chromeos/ownership/owner_settings_service_factory.h', + 'browser/chromeos/platform_keys/platform_keys.h', + 'browser/chromeos/platform_keys/platform_keys_nss.cc', + 'browser/chromeos/platform_keys/platform_keys_service.cc', + 'browser/chromeos/platform_keys/platform_keys_service.h', + 'browser/chromeos/platform_keys/platform_keys_service_factory.cc', + 'browser/chromeos/platform_keys/platform_keys_service_factory.h', 'browser/chromeos/policy/app_pack_updater.cc', 'browser/chromeos/policy/app_pack_updater.h', 'browser/chromeos/policy/auto_enrollment_client.cc', 'browser/chromeos/policy/auto_enrollment_client.h', + 'browser/chromeos/policy/browser_policy_connector_chromeos.cc', + 'browser/chromeos/policy/browser_policy_connector_chromeos.h', 'browser/chromeos/policy/cloud_external_data_manager_base.cc', 'browser/chromeos/policy/cloud_external_data_manager_base.h', 'browser/chromeos/policy/cloud_external_data_policy_observer.cc', @@ -703,12 +798,16 @@ 'browser/chromeos/policy/device_local_account_external_data_manager.h', 'browser/chromeos/policy/device_local_account_external_data_service.cc', 'browser/chromeos/policy/device_local_account_external_data_service.h', + 'browser/chromeos/policy/device_local_account_extension_tracker.cc', + 'browser/chromeos/policy/device_local_account_extension_tracker.h', 'browser/chromeos/policy/device_local_account_policy_provider.cc', 'browser/chromeos/policy/device_local_account_policy_provider.h', 'browser/chromeos/policy/device_local_account_policy_service.cc', 'browser/chromeos/policy/device_local_account_policy_service.h', 'browser/chromeos/policy/device_local_account_policy_store.cc', 'browser/chromeos/policy/device_local_account_policy_store.h', + 'browser/chromeos/policy/device_network_configuration_updater.cc', + 'browser/chromeos/policy/device_network_configuration_updater.h', 'browser/chromeos/policy/device_policy_decoder_chromeos.cc', 'browser/chromeos/policy/device_policy_decoder_chromeos.h', 'browser/chromeos/policy/device_status_collector.cc', @@ -721,8 +820,6 @@ 'browser/chromeos/policy/enterprise_install_attributes.h', 'browser/chromeos/policy/login_profile_policy_provider.cc', 'browser/chromeos/policy/login_profile_policy_provider.h', - 'browser/chromeos/policy/login_screen_power_management_policy.cc', - 'browser/chromeos/policy/login_screen_power_management_policy.h', 'browser/chromeos/policy/network_configuration_updater.cc', 'browser/chromeos/policy/network_configuration_updater.h', 'browser/chromeos/policy/policy_cert_service.cc', @@ -733,12 +830,14 @@ 'browser/chromeos/policy/policy_cert_verifier.h', 'browser/chromeos/policy/policy_oauth2_token_fetcher.cc', 'browser/chromeos/policy/policy_oauth2_token_fetcher.h', - 'browser/chromeos/policy/proxy_policy_provider.cc', - 'browser/chromeos/policy/proxy_policy_provider.h', 'browser/chromeos/policy/recommendation_restorer.cc', 'browser/chromeos/policy/recommendation_restorer.h', 'browser/chromeos/policy/recommendation_restorer_factory.cc', 'browser/chromeos/policy/recommendation_restorer_factory.h', + 'browser/chromeos/policy/server_backed_device_state.cc', + 'browser/chromeos/policy/server_backed_device_state.h', + 'browser/chromeos/policy/server_backed_state_keys_broker.cc', + 'browser/chromeos/policy/server_backed_state_keys_broker.h', 'browser/chromeos/policy/user_cloud_external_data_manager.cc', 'browser/chromeos/policy/user_cloud_external_data_manager.h', 'browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc', @@ -761,6 +860,8 @@ 'browser/chromeos/policy/user_policy_token_loader.h', 'browser/chromeos/policy/wildcard_login_checker.cc', 'browser/chromeos/policy/wildcard_login_checker.h', + 'browser/chromeos/power/cpu_data_collector.cc', + 'browser/chromeos/power/cpu_data_collector.h', 'browser/chromeos/power/idle_action_warning_dialog_view.cc', 'browser/chromeos/power/idle_action_warning_dialog_view.h', 'browser/chromeos/power/idle_action_warning_observer.cc', @@ -769,6 +870,8 @@ 'browser/chromeos/power/peripheral_battery_observer.h', 'browser/chromeos/power/power_button_observer.cc', 'browser/chromeos/power/power_button_observer.h', + 'browser/chromeos/power/power_data_collector.cc', + 'browser/chromeos/power/power_data_collector.h', 'browser/chromeos/power/power_prefs.cc', 'browser/chromeos/power/power_prefs.h', 'browser/chromeos/power/session_state_controller_delegate_chromeos.cc', @@ -780,6 +883,10 @@ 'browser/chromeos/profiles/avatar_menu_actions_chromeos.cc', 'browser/chromeos/profiles/avatar_menu_actions_chromeos.h', 'browser/chromeos/profiles/avatar_menu_chromeos.cc', + 'browser/chromeos/profiles/multiprofiles_intro_dialog.cc', + 'browser/chromeos/profiles/multiprofiles_intro_dialog.h', + 'browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc', + 'browser/chromeos/profiles/multiprofiles_session_aborted_dialog.h', 'browser/chromeos/profiles/profile_helper.cc', 'browser/chromeos/profiles/profile_helper.h', 'browser/chromeos/profiles/profile_list_chromeos.cc', @@ -790,10 +897,15 @@ 'browser/chromeos/proxy_config_service_impl.h', 'browser/chromeos/proxy_cros_settings_parser.cc', 'browser/chromeos/proxy_cros_settings_parser.h', + 'browser/chromeos/reset/metrics.h', 'browser/chromeos/session_length_limiter.cc', 'browser/chromeos/session_length_limiter.h', + 'browser/chromeos/set_time_dialog.cc', + 'browser/chromeos/set_time_dialog.h', 'browser/chromeos/settings/cros_settings.cc', 'browser/chromeos/settings/cros_settings.h', + 'browser/chromeos/settings/device_identity_provider.cc', + 'browser/chromeos/settings/device_identity_provider.h', 'browser/chromeos/settings/device_oauth2_token_service.cc', 'browser/chromeos/settings/device_oauth2_token_service.h', 'browser/chromeos/settings/device_oauth2_token_service_factory.cc', @@ -822,8 +934,6 @@ 'browser/chromeos/status/data_promo_notification.h', 'browser/chromeos/status/network_menu.cc', 'browser/chromeos/status/network_menu.h', - 'browser/chromeos/system/ash_system_tray_delegate.cc', - 'browser/chromeos/system/ash_system_tray_delegate.h', 'browser/chromeos/system/automatic_reboot_manager.cc', 'browser/chromeos/system/automatic_reboot_manager.h', 'browser/chromeos/system/automatic_reboot_manager_observer.h', @@ -837,12 +947,6 @@ 'browser/chromeos/system/syslogs_provider.h', 'browser/chromeos/system/timezone_util.cc', 'browser/chromeos/system/timezone_util.h', - 'browser/chromeos/system_key_event_listener.cc', - 'browser/chromeos/system_key_event_listener.h', - 'browser/chromeos/system_logs/about_system_logs_fetcher.cc', - 'browser/chromeos/system_logs/about_system_logs_fetcher.h', - 'browser/chromeos/system_logs/chrome_internal_log_source.cc', - 'browser/chromeos/system_logs/chrome_internal_log_source.h', 'browser/chromeos/system_logs/command_line_log_source.cc', 'browser/chromeos/system_logs/command_line_log_source.h', 'browser/chromeos/system_logs/dbus_log_source.cc', @@ -851,16 +955,16 @@ 'browser/chromeos/system_logs/debug_daemon_log_source.h', 'browser/chromeos/system_logs/lsb_release_log_source.cc', 'browser/chromeos/system_logs/lsb_release_log_source.h', - 'browser/chromeos/system_logs/memory_details_log_source.cc', - 'browser/chromeos/system_logs/memory_details_log_source.h', 'browser/chromeos/system_logs/network_event_log_source.cc', 'browser/chromeos/system_logs/network_event_log_source.h', - 'browser/chromeos/system_logs/scrubbed_system_logs_fetcher.cc', - 'browser/chromeos/system_logs/scrubbed_system_logs_fetcher.h', - 'browser/chromeos/system_logs/system_logs_fetcher_base.cc', - 'browser/chromeos/system_logs/system_logs_fetcher_base.h', 'browser/chromeos/system_logs/touch_log_source.cc', 'browser/chromeos/system_logs/touch_log_source.h', + 'browser/chromeos/timezone/timezone_provider.h', + 'browser/chromeos/timezone/timezone_provider.cc', + 'browser/chromeos/timezone/timezone_request.cc', + 'browser/chromeos/timezone/timezone_request.h', + 'browser/chromeos/ui/choose_mobile_network_dialog.cc', + 'browser/chromeos/ui/choose_mobile_network_dialog.h', 'browser/chromeos/ui/echo_dialog_listener.h', 'browser/chromeos/ui/echo_dialog_view.cc', 'browser/chromeos/ui/echo_dialog_view.h', @@ -868,10 +972,18 @@ 'browser/chromeos/ui/focus_ring_controller.h', 'browser/chromeos/ui/focus_ring_layer.cc', 'browser/chromeos/ui/focus_ring_layer.h', + 'browser/chromeos/ui/idle_app_name_notification_view.cc', + 'browser/chromeos/ui/idle_app_name_notification_view.h', 'browser/chromeos/ui/idle_logout_dialog_view.cc', '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/mobile_config_ui.cc', + 'browser/chromeos/ui/mobile_config_ui.h', 'browser/chromeos/ui/screen_capture_notification_ui_chromeos.cc', 'browser/chromeos/ui/screen_capture_notification_ui_chromeos.h', + 'browser/chromeos/chromeos_utils.cc', + 'browser/chromeos/chromeos_utils.h', 'browser/chromeos/ui_proxy_config.cc', 'browser/chromeos/ui_proxy_config.h', 'browser/chromeos/ui_proxy_config_service.cc', @@ -880,12 +992,20 @@ 'browser/chromeos/upgrade_detector_chromeos.h', 'browser/chromeos/version_loader.cc', 'browser/chromeos/version_loader.h', - 'browser/chromeos/xinput_hierarchy_changed_event_listener.cc', - 'browser/chromeos/xinput_hierarchy_changed_event_listener.h', - 'browser/chromeos/xinput_hierarchy_changed_event_listener_aura.cc', + 'browser/supervised_user/chromeos/manager_password_service.cc', + 'browser/supervised_user/chromeos/manager_password_service.h', + 'browser/supervised_user/chromeos/manager_password_service_factory.cc', + 'browser/supervised_user/chromeos/manager_password_service_factory.h', + 'browser/supervised_user/chromeos/supervised_user_password_service.cc', + 'browser/supervised_user/chromeos/supervised_user_password_service.h', + 'browser/supervised_user/chromeos/supervised_user_password_service_factory.cc', + 'browser/supervised_user/chromeos/supervised_user_password_service_factory.h', ], 'conditions': [ ['enable_extensions==1', { + 'dependencies': [ + '../ui/file_manager/file_manager.gyp:file_manager', + ], 'sources': [ # Only extension API implementations should go here. 'browser/chromeos/extensions/echo_private_api.cc', @@ -919,12 +1039,12 @@ 'browser/chromeos/extensions/file_manager/private_api_util.h', 'browser/chromeos/extensions/file_system_provider/file_system_provider_api.cc', 'browser/chromeos/extensions/file_system_provider/file_system_provider_api.h', + 'browser/chromeos/extensions/file_system_provider/provider_function.cc', + 'browser/chromeos/extensions/file_system_provider/provider_function.h', 'browser/chromeos/extensions/first_run_private_api.cc', 'browser/chromeos/extensions/first_run_private_api.h', 'browser/chromeos/extensions/input_method_api.cc', 'browser/chromeos/extensions/input_method_api.h', - 'browser/chromeos/extensions/screenlock_private_api.cc', - 'browser/chromeos/extensions/screenlock_private_api.h', 'browser/chromeos/extensions/media_player_api.cc', 'browser/chromeos/extensions/media_player_api.h', 'browser/chromeos/extensions/wallpaper_manager_util.cc', @@ -951,7 +1071,8 @@ ['use_ash==1', { 'dependencies': [ '../ash/ash.gyp:ash', - '../ash/ash.gyp:ash_resources', + '../ash/ash.gyp:ash_with_content', + '../ash/ash_resources.gyp:ash_resources', '../ash/ash_strings.gyp:ash_strings', '../ui/app_list/app_list.gyp:app_list', '../ui/message_center/message_center.gyp:message_center', @@ -972,7 +1093,6 @@ 'dependencies': [ '../build/linux/system.gyp:dbus', '../build/linux/system.gyp:fontconfig', - '../build/linux/system.gyp:x11', '../ui/views/views.gyp:views', ], 'include_dirs': [ @@ -984,11 +1104,31 @@ ['include', '^browser/chromeos/status/memory_menu_button.h'], ], }], + ['use_aura==1 and use_x11==1', { + 'dependencies': [ + '../build/linux/system.gyp:x11', + '../ui/events/platform/x11/x11_events_platform.gyp:x11_events_platform', + '../ui/gfx/x/gfx_x11.gyp:gfx_x11', + ], + }], ['enable_printing != 0', { 'dependencies': [ '../printing/printing.gyp:printing', ], }], + ['use_ozone == 1', { + 'dependencies': [ + '../ui/ozone/ozone.gyp:ozone', + ], + 'sources!': [ + 'browser/chromeos/events/system_key_event_listener.cc', + 'browser/chromeos/events/system_key_event_listener.h', + 'browser/chromeos/events/xinput_hierarchy_changed_event_listener.cc', + 'browser/chromeos/events/xinput_hierarchy_changed_event_listener.h', + 'browser/chromeos/input_method/input_method_engine.cc', + 'browser/chromeos/input_method/input_method_engine.h', + ], + }], ], }, { |