Commit 8e8febe8 authored by Luciano Pacheco's avatar Luciano Pacheco Committed by Chromium LUCI CQ

Files app: Prepare foreground for JS modules

- Add the JS module for icons.html.
- Add the required resources to preprocess_if_exp)

Bug: 1133186
Change-Id: Iac0c6f0c84e14bd1511157677452bc643bf9829a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2636095
Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
Reviewed-by: default avatarJeremie Boulic <jboulic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844649}
parent 92138ba4
...@@ -85,6 +85,7 @@ preprocess_if_expr("preprocess_static") { ...@@ -85,6 +85,7 @@ preprocess_if_expr("preprocess_static") {
"audio_player/js/main.m.js", "audio_player/js/main.m.js",
"audio_player/js/main_background.m.js", "audio_player/js/main_background.m.js",
"file_manager/background/js/main_background.m.js", "file_manager/background/js/main_background.m.js",
"file_manager/foreground/js/elements_importer.m.js",
"video_player/js/main.m.js", "video_player/js/main.m.js",
"video_player/js/main_background.m.js", "video_player/js/main_background.m.js",
] ]
...@@ -148,7 +149,11 @@ preprocess_if_expr("preprocess_generated") { ...@@ -148,7 +149,11 @@ preprocess_if_expr("preprocess_generated") {
"externs/background/media_scanner.m.js", "externs/background/media_scanner.m.js",
"externs/background/progress_center.m.js", "externs/background/progress_center.m.js",
"externs/background/task_queue.m.js", "externs/background/task_queue.m.js",
"externs/background_window.m.js",
"externs/command_handler_deps.m.js",
"externs/directory_change_event.m.js",
"externs/entry_location.m.js", "externs/entry_location.m.js",
"externs/entries_changed_event.m.js",
"externs/exif_entry.m.js", "externs/exif_entry.m.js",
"externs/files_app_entry_interfaces.m.js", "externs/files_app_entry_interfaces.m.js",
"externs/metadata_worker_window.m.js", "externs/metadata_worker_window.m.js",
...@@ -190,37 +195,150 @@ preprocess_if_expr("preprocess_generated") { ...@@ -190,37 +195,150 @@ preprocess_if_expr("preprocess_generated") {
"file_manager/background/js/volume_manager_util.m.js", "file_manager/background/js/volume_manager_util.m.js",
# Files app Foreground: # Files app Foreground:
"file_manager/foreground/js/actions_controller.m.js",
"file_manager/foreground/js/actions_model.m.js",
"file_manager/foreground/js/android_app_list_model.m.js",
"file_manager/foreground/js/app_state_controller.m.js",
"file_manager/foreground/js/column_visibility_controller.m.js",
"file_manager/foreground/js/constants.m.js",
"file_manager/foreground/js/crossover_search_utils.m.js",
"file_manager/foreground/js/crostini_controller.m.js",
"file_manager/foreground/js/dialog_action_controller.m.js",
"file_manager/foreground/js/dialog_type.m.js",
"file_manager/foreground/js/directory_contents.m.js",
"file_manager/foreground/js/directory_model.m.js",
"file_manager/foreground/js/directory_tree_naming_controller.m.js",
"file_manager/foreground/js/drop_effect_and_label.m.js",
"file_manager/foreground/js/empty_folder_controller.m.js",
"file_manager/foreground/js/file_list_model.m.js",
"file_manager/foreground/js/file_manager.m.js",
"file_manager/foreground/js/file_manager_commands.m.js",
"file_manager/foreground/js/file_selection.m.js",
"file_manager/foreground/js/file_tasks.m.js",
"file_manager/foreground/js/file_transfer_controller.m.js",
"file_manager/foreground/js/file_type_filters_controller.m.js",
"file_manager/foreground/js/file_watcher.m.js",
"file_manager/foreground/js/folder_shortcuts_data_model.m.js",
"file_manager/foreground/js/gear_menu_controller.m.js",
"file_manager/foreground/js/holding_space_util.m.js",
"file_manager/foreground/js/import_controller.m.js",
"file_manager/foreground/js/last_modified_controller.m.js",
"file_manager/foreground/js/launch_param.m.js",
"file_manager/foreground/js/list_thumbnail_loader.m.js",
"file_manager/foreground/js/main_window_component.m.js",
"file_manager/foreground/js/metadata_box_controller.m.js",
"file_manager/foreground/js/metadata_update_controller.m.js",
"file_manager/foreground/js/naming_controller.m.js",
"file_manager/foreground/js/navigation_list_model.m.js",
"file_manager/foreground/js/navigation_uma.m.js",
"file_manager/foreground/js/path_component.m.js",
"file_manager/foreground/js/providers_model.m.js",
"file_manager/foreground/js/quick_view_controller.m.js",
"file_manager/foreground/js/quick_view_model.m.js",
"file_manager/foreground/js/quick_view_uma.m.js",
"file_manager/foreground/js/scan_controller.m.js",
"file_manager/foreground/js/search_controller.m.js",
"file_manager/foreground/js/selection_menu_controller.m.js",
"file_manager/foreground/js/sort_menu_controller.m.js",
"file_manager/foreground/js/spinner_controller.m.js",
"file_manager/foreground/js/task_controller.m.js",
"file_manager/foreground/js/task_history.m.js",
"file_manager/foreground/js/thumbnail_loader.m.js", "file_manager/foreground/js/thumbnail_loader.m.js",
"file_manager/foreground/js/toolbar_controller.m.js",
"file_manager/foreground/js/web_store_utils.m.js",
"file_manager/foreground/js/webui_command_extender.m.js",
# Files app Elements: # Files app Elements:
"file_manager/foreground/elements/icons.m.js",
"file_manager/foreground/elements/files_icon_button.m.js", "file_manager/foreground/elements/files_icon_button.m.js",
"file_manager/foreground/elements/files_message.m.js",
"file_manager/foreground/elements/files_metadata_box.m.js",
"file_manager/foreground/elements/files_metadata_entry.m.js",
"file_manager/foreground/elements/files_password_dialog.m.js",
"file_manager/foreground/elements/files_quick_view.m.js",
"file_manager/foreground/elements/files_ripple.m.js",
"file_manager/foreground/elements/files_safe_media.m.js",
"file_manager/foreground/elements/files_toast.m.js",
"file_manager/foreground/elements/files_toggle_ripple.m.js",
"file_manager/foreground/elements/files_tooltip.m.js",
# Files app UI:
"file_manager/foreground/js/ui/a11y_announce.m.js",
"file_manager/foreground/js/ui/action_model_ui.m.js",
"file_manager/foreground/js/ui/actions_submenu.m.js",
"file_manager/foreground/js/ui/autocomplete_list.m.js",
"file_manager/foreground/js/ui/banners.m.js",
"file_manager/foreground/js/ui/breadcrumb.m.js",
"file_manager/foreground/js/ui/combobutton.m.js",
"file_manager/foreground/js/ui/commandbutton.m.js",
"file_manager/foreground/js/ui/default_task_dialog.m.js",
"file_manager/foreground/js/ui/dialog_footer.m.js",
"file_manager/foreground/js/ui/directory_tree.m.js",
"file_manager/foreground/js/ui/drag_selector.m.js",
"file_manager/foreground/js/ui/import_crostini_image_dialog.m.js",
"file_manager/foreground/js/ui/install_linux_package_dialog.m.js",
"file_manager/foreground/js/ui/empty_folder.m.js",
"file_manager/foreground/js/ui/file_grid.m.js",
"file_manager/foreground/js/ui/file_list_selection_model.m.js",
"file_manager/foreground/js/ui/file_manager_dialog_base.m.js",
"file_manager/foreground/js/ui/file_manager_ui.m.js",
"file_manager/foreground/js/ui/file_metadata_formatter.m.js",
"file_manager/foreground/js/ui/file_table.m.js",
"file_manager/foreground/js/ui/file_table_list.m.js",
"file_manager/foreground/js/ui/file_tap_handler.m.js",
"file_manager/foreground/js/ui/files_alert_dialog.m.js",
"file_manager/foreground/js/ui/files_confirm_dialog.m.js",
"file_manager/foreground/js/ui/files_menu.m.js",
"file_manager/foreground/js/ui/gear_menu.m.js",
"file_manager/foreground/js/ui/list_container.m.js",
"file_manager/foreground/js/ui/location_line.m.js",
"file_manager/foreground/js/ui/multi_menu.m.js",
"file_manager/foreground/js/ui/multi_menu_button.m.js",
"file_manager/foreground/js/ui/progress_center_panel.m.js",
"file_manager/foreground/js/ui/providers_menu.m.js",
"file_manager/foreground/js/ui/search_box.m.js",
"file_manager/foreground/js/ui/suggest_apps_dialog.m.js",
"file_manager/foreground/js/ui/table/table.m.js",
"file_manager/foreground/js/ui/table/table_column.m.js",
"file_manager/foreground/js/ui/table/table_column_model.m.js",
"file_manager/foreground/js/ui/table/table_header.m.js",
"file_manager/foreground/js/ui/table/table_list.m.js",
"file_manager/foreground/js/ui/table/table_splitter.m.js",
# CWS:
"file_manager/cws_widget/app_installer.m.js",
"file_manager/cws_widget/cws_webview_client.m.js",
"file_manager/cws_widget/cws_widget_container.m.js",
"file_manager/cws_widget/cws_widget_container_error_dialog.m.js",
"file_manager/cws_widget/cws_widget_container_platform_delegate.m.js",
# Image Loader: # Image Loader:
"image_loader/image_loader_client.m.js", "image_loader/image_loader_client.m.js",
"image_loader/load_image_request.m.js", "image_loader/load_image_request.m.js",
# Metadata: # Metadata:
"file_manager/foreground/js/metadata/byte_reader.m.js",
"file_manager/foreground/js/metadata/content_metadata_provider.m.js", "file_manager/foreground/js/metadata/content_metadata_provider.m.js",
"file_manager/foreground/js/metadata/exif_constants.m.js",
"file_manager/foreground/js/metadata/exif_parser.m.js",
"file_manager/foreground/js/metadata/external_metadata_provider.m.js", "file_manager/foreground/js/metadata/external_metadata_provider.m.js",
"file_manager/foreground/js/metadata/file_system_metadata_provider.m.js", "file_manager/foreground/js/metadata/file_system_metadata_provider.m.js",
"file_manager/foreground/js/metadata/multi_metadata_provider.m.js", "file_manager/foreground/js/metadata/function_parallel.m.js",
"file_manager/foreground/js/metadata/metadata_model.m.js", "file_manager/foreground/js/metadata/function_sequence.m.js",
"file_manager/foreground/js/metadata/id3_parser.m.js",
"file_manager/foreground/js/metadata/image_orientation.m.js",
"file_manager/foreground/js/metadata/image_parsers.m.js",
"file_manager/foreground/js/metadata/metadata_cache_item.m.js", "file_manager/foreground/js/metadata/metadata_cache_item.m.js",
"file_manager/foreground/js/metadata/metadata_item.m.js",
"file_manager/foreground/js/metadata/metadata_provider.m.js",
"file_manager/foreground/js/metadata/metadata_cache_set.m.js", "file_manager/foreground/js/metadata/metadata_cache_set.m.js",
"file_manager/foreground/js/metadata/metadata_request.m.js",
"file_manager/foreground/js/metadata/image_orientation.m.js",
"file_manager/foreground/js/metadata/metadata_dispatcher.m.js", "file_manager/foreground/js/metadata/metadata_dispatcher.m.js",
"file_manager/foreground/js/metadata/image_parsers.m.js", "file_manager/foreground/js/metadata/metadata_item.m.js",
"file_manager/foreground/js/metadata/exif_parser.m.js", "file_manager/foreground/js/metadata/metadata_model.m.js",
"file_manager/foreground/js/metadata/id3_parser.m.js",
"file_manager/foreground/js/metadata/metadata_parser.m.js", "file_manager/foreground/js/metadata/metadata_parser.m.js",
"file_manager/foreground/js/metadata/metadata_provider.m.js",
"file_manager/foreground/js/metadata/metadata_request.m.js",
"file_manager/foreground/js/metadata/mpeg_parser.m.js", "file_manager/foreground/js/metadata/mpeg_parser.m.js",
"file_manager/foreground/js/metadata/byte_reader.m.js", "file_manager/foreground/js/metadata/multi_metadata_provider.m.js",
"file_manager/foreground/js/metadata/function_parallel.m.js", "file_manager/foreground/js/metadata/thumbnail_model.m.js",
"file_manager/foreground/js/metadata/function_sequence.m.js",
"file_manager/foreground/js/metadata/exif_constants.m.js",
# Video Player: # Video Player:
"video_player/js/error_util.m.js", "video_player/js/error_util.m.js",
...@@ -239,9 +357,13 @@ preprocess_if_expr("preprocess_generated") { ...@@ -239,9 +357,13 @@ preprocess_if_expr("preprocess_generated") {
"//ui/file_manager/externs/background:modulize", "//ui/file_manager/externs/background:modulize",
"//ui/file_manager/file_manager/background/js:modulize", "//ui/file_manager/file_manager/background/js:modulize",
"//ui/file_manager/file_manager/common/js:modulize", "//ui/file_manager/file_manager/common/js:modulize",
"//ui/file_manager/file_manager/cws_widget:modulize",
"//ui/file_manager/file_manager/foreground/elements:elements", "//ui/file_manager/file_manager/foreground/elements:elements",
"//ui/file_manager/file_manager/foreground/elements:modulize",
"//ui/file_manager/file_manager/foreground/js:modulize", "//ui/file_manager/file_manager/foreground/js:modulize",
"//ui/file_manager/file_manager/foreground/js/metadata:modulize", "//ui/file_manager/file_manager/foreground/js/metadata:modulize",
"//ui/file_manager/file_manager/foreground/js/ui:modulize",
"//ui/file_manager/file_manager/foreground/js/ui/table:modulize",
"//ui/file_manager/image_loader:modulize", "//ui/file_manager/image_loader:modulize",
"//ui/file_manager/video_player/js:modulize", "//ui/file_manager/video_player/js:modulize",
] ]
......
...@@ -14,8 +14,15 @@ group("elements") { ...@@ -14,8 +14,15 @@ group("elements") {
visibility += [ "//ui/file_manager/*" ] visibility += [ "//ui/file_manager/*" ]
public_deps = [ public_deps = [
"//ui/file_manager/file_manager/foreground/elements:files_icon_button_module", "//ui/file_manager/file_manager/foreground/elements:files_icon_button_module",
"//ui/file_manager/file_manager/foreground/elements:files_metadata_box_module",
"//ui/file_manager/file_manager/foreground/elements:files_metadata_entry_module",
"//ui/file_manager/file_manager/foreground/elements:files_quick_view_module",
"//ui/file_manager/file_manager/foreground/elements:files_ripple_module", "//ui/file_manager/file_manager/foreground/elements:files_ripple_module",
"//ui/file_manager/file_manager/foreground/elements:files_safe_media_module",
"//ui/file_manager/file_manager/foreground/elements:files_toast_module",
"//ui/file_manager/file_manager/foreground/elements:files_toggle_ripple_module", "//ui/file_manager/file_manager/foreground/elements:files_toggle_ripple_module",
"//ui/file_manager/file_manager/foreground/elements:files_tooltip_module",
"//ui/file_manager/file_manager/foreground/elements:icons_module",
] ]
} }
...@@ -432,6 +439,12 @@ js_unittest("files_xf_elements_unittest.m") { ...@@ -432,6 +439,12 @@ js_unittest("files_xf_elements_unittest.m") {
externs_list = [ "$externs_path/file_manager_private.js" ] externs_list = [ "$externs_path/file_manager_private.js" ]
} }
polymer_modulizer("icons") {
js_file = "icons.m.js"
html_file = "icons.html"
html_type = "iron-iconset"
}
js_library("xf_button") { js_library("xf_button") {
deps = [ deps = [
"//ui/webui/resources/cr_elements/cr_button:cr_button", "//ui/webui/resources/cr_elements/cr_button:cr_button",
......
...@@ -14,8 +14,6 @@ import '../elements/files_spinner.m.js'; ...@@ -14,8 +14,6 @@ import '../elements/files_spinner.m.js';
import '../elements/files_toast.m.js'; import '../elements/files_toast.m.js';
import '../elements/files_toggle_ripple.m.js'; import '../elements/files_toggle_ripple.m.js';
import '../elements/files_tooltip.m.js'; import '../elements/files_tooltip.m.js';
// TODO(lucmult): Figure out if icons.html is needed here.
// import '../elements/icons.m.js';
import '../elements/xf_button.m.js'; import '../elements/xf_button.m.js';
import '../elements/xf_circular_progress.m.js'; import '../elements/xf_circular_progress.m.js';
import '../elements/xf_display_panel.m.js'; import '../elements/xf_display_panel.m.js';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment