Commit 3d975a5e authored by Luciano Pacheco's avatar Luciano Pacheco Committed by Chromium LUCI CQ

Files app: Generate JS modules for foreground page

Add JS module for //ui/file_manager/file_manager/foreground/js/ :

Files app: Add JS module for quick_view_uma.js
Files app: Add JS module for quick_view_controller.js
Files app: Add JS module for scan_controller.js

Bug: 1133186
Change-Id: I7a47a9fb7c5cb0a11ebeb123f86a12a312b23239
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2631654Reviewed-by: default avatarJeremie Boulic <jboulic@chromium.org>
Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843967}
parent d354b003
...@@ -69,7 +69,10 @@ js_type_check("closure_compile_jsmodules") { ...@@ -69,7 +69,10 @@ js_type_check("closure_compile_jsmodules") {
":navigation_uma.m", ":navigation_uma.m",
":path_component.m", ":path_component.m",
":providers_model.m", ":providers_model.m",
":quick_view_controller.m",
":quick_view_model.m", ":quick_view_model.m",
":quick_view_uma.m",
":scan_controller.m",
":selection_menu_controller.m", ":selection_menu_controller.m",
":sort_menu_controller.m", ":sort_menu_controller.m",
":spinner_controller.m", ":spinner_controller.m",
...@@ -1525,6 +1528,39 @@ js_library("quick_view_controller") { ...@@ -1525,6 +1528,39 @@ js_library("quick_view_controller") {
] ]
} }
js_library("quick_view_controller.m") {
sources = [ "$root_gen_dir/ui/file_manager/file_manager/foreground/js/quick_view_controller.m.js" ]
deps = [
":constants.m",
":dialog_type.m",
":file_manager_commands.m",
":file_selection.m",
":file_tasks.m",
":metadata_box_controller.m",
":quick_view_model.m",
":quick_view_uma.m",
":task_controller.m",
":thumbnail_loader.m",
"metadata:metadata_item.m",
"metadata:metadata_model.m",
"ui:file_list_selection_model.m",
"ui:files_confirm_dialog.m",
"ui:list_container.m",
"ui:multi_menu_button.m",
"//ui/file_manager/base/js:volume_manager_types.m",
"//ui/file_manager/externs:command_handler_deps.m",
"//ui/file_manager/externs:volume_manager.m",
"//ui/file_manager/file_manager/common/js:file_type.m",
"//ui/file_manager/file_manager/common/js:util.m",
"//ui/file_manager/file_manager/foreground/elements:files_quick_view.m",
"//ui/file_manager/image_loader:image_loader_client.m",
"//ui/file_manager/image_loader:load_image_request.m",
"//ui/webui/resources/js:assert.m",
]
extra_deps = [ ":modulize" ]
}
js_library("quick_view_model") { js_library("quick_view_model") {
deps = [ deps = [
"//ui/webui/resources/js:cr", "//ui/webui/resources/js:cr",
...@@ -1550,6 +1586,21 @@ js_library("quick_view_uma") { ...@@ -1550,6 +1586,21 @@ js_library("quick_view_uma") {
] ]
} }
js_library("quick_view_uma.m") {
sources = [ "$root_gen_dir/ui/file_manager/file_manager/foreground/js/quick_view_uma.m.js" ]
deps = [
":dialog_type.m",
":file_tasks.m",
"//ui/file_manager/base/js:volume_manager_types.m",
"//ui/file_manager/externs:volume_manager.m",
"//ui/file_manager/file_manager/common/js:file_type.m",
"//ui/file_manager/file_manager/common/js:metrics.m",
"//ui/webui/resources/js:assert.m",
]
extra_deps = [ ":modulize" ]
}
js_library("scan_controller") { js_library("scan_controller") {
deps = [ deps = [
":directory_model", ":directory_model",
...@@ -1560,6 +1611,19 @@ js_library("scan_controller") { ...@@ -1560,6 +1611,19 @@ js_library("scan_controller") {
] ]
} }
js_library("scan_controller.m") {
sources = [ "$root_gen_dir/ui/file_manager/file_manager/foreground/js/scan_controller.m.js" ]
deps = [
":directory_model.m",
":file_manager_commands.m",
":file_selection.m",
":spinner_controller.m",
"ui:list_container.m",
]
extra_deps = [ ":modulize" ]
}
js_library("search_controller") { js_library("search_controller") {
deps = [ deps = [
":directory_model", ":directory_model",
...@@ -1838,6 +1902,7 @@ js_modulizer("modulize") { ...@@ -1838,6 +1902,7 @@ js_modulizer("modulize") {
"app_state_controller.js", "app_state_controller.js",
"constants.js", "constants.js",
"crossover_search_utils.js", "crossover_search_utils.js",
"crostini_controller.js",
"dialog_type.js", "dialog_type.js",
"directory_contents.js", "directory_contents.js",
"directory_model.js", "directory_model.js",
...@@ -1854,6 +1919,7 @@ js_modulizer("modulize") { ...@@ -1854,6 +1919,7 @@ js_modulizer("modulize") {
"file_type_filters_controller.js", "file_type_filters_controller.js",
"file_watcher.js", "file_watcher.js",
"folder_shortcuts_data_model.js", "folder_shortcuts_data_model.js",
"gear_menu_controller.js",
"holding_space_util.js", "holding_space_util.js",
"import_controller.js", "import_controller.js",
"last_modified_controller.js", "last_modified_controller.js",
...@@ -1873,7 +1939,10 @@ js_modulizer("modulize") { ...@@ -1873,7 +1939,10 @@ js_modulizer("modulize") {
"navigation_uma.js", "navigation_uma.js",
"path_component.js", "path_component.js",
"providers_model.js", "providers_model.js",
"quick_view_controller.js",
"quick_view_model.js", "quick_view_model.js",
"quick_view_uma.js",
"scan_controller.js",
"selection_menu_controller.js", "selection_menu_controller.js",
"sort_menu_controller.js", "sort_menu_controller.js",
"spinner_controller.js", "spinner_controller.js",
...@@ -1883,8 +1952,6 @@ js_modulizer("modulize") { ...@@ -1883,8 +1952,6 @@ js_modulizer("modulize") {
"toolbar_controller.js", "toolbar_controller.js",
"web_store_utils.js", "web_store_utils.js",
"webui_command_extender.js", "webui_command_extender.js",
"crostini_controller.js",
"gear_menu_controller.js",
] ]
namespace_rewrites = cr_namespace_rewrites + [ namespace_rewrites = cr_namespace_rewrites + [
......
...@@ -2,10 +2,38 @@ ...@@ -2,10 +2,38 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// clang-format off
// #import {assert} from 'chrome://resources/js/assert.m.js';
// #import {MetadataItem} from './metadata/metadata_item.m.js';
// #import {FileTasks} from './file_tasks.m.js';
// #import {FilesQuickView} from '../elements/files_quick_view.m.js';
// #import {VolumeManager} from '../../../externs/volume_manager.m.js';
// #import {MetadataBoxController} from './metadata_box_controller.m.js';
// #import {FileListSelectionModel} from './ui/file_list_selection_model.m.js';
// #import {TaskController} from './task_controller.m.js';
// #import {QuickViewModel} from './quick_view_model.m.js';
// #import {MultiMenuButton} from './ui/multi_menu_button.m.js';
// #import {ListContainer} from './ui/list_container.m.js';
// #import {MetadataModel} from './metadata/metadata_model.m.js';
// #import {CommandHandlerDeps} from '../../../externs/command_handler_deps.m.js';
// #import {VolumeManagerCommon} from '../../../base/js/volume_manager_types.m.js';
// #import {ThumbnailLoader} from './thumbnail_loader.m.js';
// #import {ImageLoaderClient} from '../../../image_loader/image_loader_client.m.js';
// #import {LoadImageResponseStatus, LoadImageRequest} from '../../../image_loader/load_image_request.m.js';
// #import {FileType} from '../../common/js/file_type.m.js';
// #import {CommandHandler} from './file_manager_commands.m.js';
// #import {FilesConfirmDialog} from './ui/files_confirm_dialog.m.js';
// #import {constants} from './constants.m.js';
// #import {util, str} from '../../common/js/util.m.js';
// #import {DialogType} from './dialog_type.m.js';
// #import {QuickViewUma} from './quick_view_uma.m.js';
// #import {FileSelectionHandler} from './file_selection.m.js';
// clang-format on
/** /**
* Controller for QuickView. * Controller for QuickView.
*/ */
class QuickViewController { /* #export */ class QuickViewController {
/** /**
* This should be initialized with |init_| method. * This should be initialized with |init_| method.
* *
...@@ -159,10 +187,16 @@ class QuickViewController { ...@@ -159,10 +187,16 @@ class QuickViewController {
*/ */
createQuickView_() { createQuickView_() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
Polymer.Base.importHref(constants.FILES_QUICK_VIEW_HTML, () => {
const quickView = document.querySelector('#quick-view'); const quickView = document.querySelector('#quick-view');
// Workaround: Polymer.Base is only defined on Polymer2.
// For Polymer3 the QuickView is already imported at the top.
if (Polymer.Base) {
/* #ignore */ Polymer.Base.importHref(
/* #ignore */ constants.FILES_QUICK_VIEW_HTML,
/* #ignore */ () => resolve(quickView), reject);
} else {
resolve(quickView); resolve(quickView);
}, reject); }
}); });
} }
...@@ -514,7 +548,7 @@ class QuickViewController { ...@@ -514,7 +548,7 @@ class QuickViewController {
const volumeInfo = this.volumeManager_.getVolumeInfo(entry); const volumeInfo = this.volumeManager_.getVolumeInfo(entry);
let localFile = volumeInfo && let localFile = volumeInfo &&
QuickViewController.LOCAL_VOLUME_TYPES_.indexOf( QuickViewController.LOCAL_VOLUME_TYPES_.indexOf(
volumeInfo.volumeType) >= 0; assert(volumeInfo.volumeType)) >= 0;
// Treat certain types on Drive as if they were local (try auto-play etc). // Treat certain types on Drive as if they were local (try auto-play etc).
if (entryIsOnDrive && (type === 'audio' || type === 'video')) { if (entryIsOnDrive && (type === 'audio' || type === 'video')) {
......
...@@ -2,10 +2,20 @@ ...@@ -2,10 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// clang-format off
// #import {VolumeManager} from '../../../externs/volume_manager.m.js';
// #import {VolumeManagerCommon} from '../../../base/js/volume_manager_types.m.js';
// #import {metrics} from '../../common/js/metrics.m.js';
// #import {DialogType} from './dialog_type.m.js';
// #import {FileTasks} from './file_tasks.m.js';
// #import {FileType} from '../../common/js/file_type.m.js';
// #import {assert} from 'chrome://resources/js/assert.m.js';
// clang-format on
/** /**
* UMA exporter for Quick View. * UMA exporter for Quick View.
*/ */
class QuickViewUma { /* #export */ class QuickViewUma {
/** /**
* @param {!VolumeManager} volumeManager * @param {!VolumeManager} volumeManager
* @param {!DialogType} dialogType * @param {!DialogType} dialogType
...@@ -64,7 +74,7 @@ class QuickViewUma { ...@@ -64,7 +74,7 @@ class QuickViewUma {
'QuickView.WayToOpen', wayToOpen, QuickViewUma.WayToOpenValues_); 'QuickView.WayToOpen', wayToOpen, QuickViewUma.WayToOpenValues_);
const volumeType = this.volumeManager_.getVolumeInfo(entry).volumeType; const volumeType = this.volumeManager_.getVolumeInfo(entry).volumeType;
if (QuickViewUma.VolumeType.includes(volumeType)) { if (QuickViewUma.VolumeType.includes(assert(volumeType))) {
metrics.recordEnum( metrics.recordEnum(
'QuickView.VolumeType', volumeType, QuickViewUma.VolumeType); 'QuickView.VolumeType', volumeType, QuickViewUma.VolumeType);
} else { } else {
......
...@@ -2,10 +2,16 @@ ...@@ -2,10 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// #import {FileSelectionHandler} from './file_selection.m.js';
// #import {SpinnerController} from './spinner_controller.m.js';
// #import {ListContainer} from './ui/list_container.m.js';
// #import {DirectoryModel} from './directory_model.m.js';
// #import {CommandHandler} from './file_manager_commands.m.js';
/** /**
* Handler for scan related events of DirectoryModel. * Handler for scan related events of DirectoryModel.
*/ */
class ScanController { /* #export */ class ScanController {
/** /**
* @param {!DirectoryModel} directoryModel * @param {!DirectoryModel} directoryModel
* @param {!ListContainer} listContainer * @param {!ListContainer} listContainer
......
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