summaryrefslogtreecommitdiff
path: root/chromium/ui/file_manager
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-05-16 09:59:13 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-05-20 10:28:53 +0000
commit6c11fb357ec39bf087b8b632e2b1e375aef1b38b (patch)
treec8315530db18a8ee566521c39ab8a6af4f72bc03 /chromium/ui/file_manager
parent3ffaed019d0772e59d6cdb2d0d32fe4834c31f72 (diff)
downloadqtwebengine-chromium-6c11fb357ec39bf087b8b632e2b1e375aef1b38b.tar.gz
BASELINE: Update Chromium to 74.0.3729.159
Change-Id: I8d2497da544c275415aedd94dd25328d555de811 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/ui/file_manager')
-rw-r--r--chromium/ui/file_manager/BUILD.gn2
-rw-r--r--chromium/ui/file_manager/audio_player/js/BUILD.gn1
-rw-r--r--chromium/ui/file_manager/base/js/BUILD.gn5
-rw-r--r--chromium/ui/file_manager/file_manager/background/js/BUILD.gn2
-rw-r--r--chromium/ui/file_manager/file_manager/common/js/BUILD.gn7
-rw-r--r--chromium/ui/file_manager/file_manager/foreground/elements/BUILD.gn15
-rw-r--r--chromium/ui/file_manager/file_manager/foreground/js/BUILD.gn1
-rw-r--r--chromium/ui/file_manager/file_manager/foreground/js/metadata/BUILD.gn10
-rw-r--r--chromium/ui/file_manager/file_manager/foreground/js/ui/BUILD.gn14
-rw-r--r--chromium/ui/file_manager/file_manager/test/BUILD.gn1
-rw-r--r--chromium/ui/file_manager/video_player/js/BUILD.gn34
-rw-r--r--chromium/ui/file_manager/video_player/js/cast/BUILD.gn1
12 files changed, 60 insertions, 33 deletions
diff --git a/chromium/ui/file_manager/BUILD.gn b/chromium/ui/file_manager/BUILD.gn
index a0c3ecdeee5..7b6bb35007a 100644
--- a/chromium/ui/file_manager/BUILD.gn
+++ b/chromium/ui/file_manager/BUILD.gn
@@ -59,12 +59,12 @@ group("unit_test_data") {
"base/js:unit_tests",
"file_manager/background/js:unit_tests",
"file_manager/common/js:unit_tests",
- "file_manager/foreground/elements:unit_tests",
"file_manager/foreground/js:unit_tests",
"file_manager/foreground/js/metadata:unit_tests",
"file_manager/foreground/js/ui:unit_tests",
"gallery/js:unit_tests",
"gallery/js/image_editor:unit_tests",
"image_loader:unit_tests",
+ "video_player/js:unit_tests",
]
}
diff --git a/chromium/ui/file_manager/audio_player/js/BUILD.gn b/chromium/ui/file_manager/audio_player/js/BUILD.gn
index 5d9d85a78c7..38aed4c4384 100644
--- a/chromium/ui/file_manager/audio_player/js/BUILD.gn
+++ b/chromium/ui/file_manager/audio_player/js/BUILD.gn
@@ -28,6 +28,7 @@ js_library("audio_player") {
deps = [
"../elements:audio_player",
"../elements:track_list",
+ "//ui/file_manager/base/js:app_util",
"//ui/file_manager/base/js:filtered_volume_manager",
"//ui/file_manager/base/js:mediasession_types",
"//ui/file_manager/file_manager/common/js:util",
diff --git a/chromium/ui/file_manager/base/js/BUILD.gn b/chromium/ui/file_manager/base/js/BUILD.gn
index 607ba927cab..5d852f1b83a 100644
--- a/chromium/ui/file_manager/base/js/BUILD.gn
+++ b/chromium/ui/file_manager/base/js/BUILD.gn
@@ -17,6 +17,7 @@ group("closure_compile") {
js_type_check("closure_compile_module") {
deps = [
+ ":app_util",
":error_counter",
":filtered_volume_manager",
]
@@ -30,6 +31,10 @@ js_type_check("test_support_type_check") {
]
}
+js_library("app_util") {
+ externs_list = [ "//ui/file_manager/externs/app_window_common.js" ]
+}
+
js_library("error_counter") {
}
diff --git a/chromium/ui/file_manager/file_manager/background/js/BUILD.gn b/chromium/ui/file_manager/file_manager/background/js/BUILD.gn
index 189b3b217f5..703de752dce 100644
--- a/chromium/ui/file_manager/file_manager/background/js/BUILD.gn
+++ b/chromium/ui/file_manager/file_manager/background/js/BUILD.gn
@@ -103,7 +103,7 @@ js_library("app_window_wrapper") {
deps = [
":app_windows",
"../../common/js:async_util",
- "../../common/js:util",
+ "//ui/file_manager/base/js:app_util",
]
}
diff --git a/chromium/ui/file_manager/file_manager/common/js/BUILD.gn b/chromium/ui/file_manager/file_manager/common/js/BUILD.gn
index 31581662ecb..07c17718f74 100644
--- a/chromium/ui/file_manager/file_manager/common/js/BUILD.gn
+++ b/chromium/ui/file_manager/file_manager/common/js/BUILD.gn
@@ -62,7 +62,6 @@ js_unittest("files_app_entry_types_unittest") {
deps = [
":files_app_entry_types",
":mock_entry",
- ":util",
"//ui/file_manager/base/js:test_error_reporting",
"//ui/file_manager/base/js:volume_manager_types",
]
@@ -105,6 +104,7 @@ js_library("test_importer_common") {
deps = [
":importer_common",
":unittest_util",
+ "//ui/file_manager/base/js:mock_chrome",
"//ui/file_manager/base/js:test_error_reporting",
]
visibility = []
@@ -171,6 +171,10 @@ js_library("util") {
deps = [
":files_app_entry_types",
"../../../externs:file_manager_private",
+
+ # TODO(tapted): Remove these base util dependencies, which exist temporarily
+ # to allow targets to depend only on util, if they depend on one of these.
+ "//ui/file_manager/base/js:app_util",
"//ui/file_manager/base/js:volume_manager_types",
"//ui/webui/resources/js:load_time_data",
"//ui/webui/resources/js:util",
@@ -179,7 +183,6 @@ js_library("util") {
]
externs_list = [
"$externs_path/command_line_private.js",
- "../../../externs/app_window_common.js",
"../../../externs/entry_location.js",
"../../../externs/platform.js",
"../../../externs/volume_info.js",
diff --git a/chromium/ui/file_manager/file_manager/foreground/elements/BUILD.gn b/chromium/ui/file_manager/file_manager/foreground/elements/BUILD.gn
index d8e8fbb11be..6be3243dbd7 100644
--- a/chromium/ui/file_manager/file_manager/foreground/elements/BUILD.gn
+++ b/chromium/ui/file_manager/file_manager/foreground/elements/BUILD.gn
@@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//third_party/closure_compiler/compile_js.gni")
-import("//third_party/closure_compiler/js_unit_tests.gni")
visibility = [ "//ui/file_manager/file_manager/foreground/*" ]
@@ -12,7 +11,6 @@ group("closure_compile") {
visibility += [ "//ui/file_manager:closure_compile" ]
deps = [
":closure_compile_module",
- ":unit_tests_type_check",
]
}
@@ -78,16 +76,3 @@ js_library("files_toggle_ripple") {
js_library("files_tooltip") {
visibility += [ "//ui/file_manager/gallery/*" ]
}
-
-js_unittest("files_tooltip_unittest") {
- deps = [
- ":files_tooltip",
- "//ui/file_manager/base/js:test_error_reporting",
- ]
-}
-
-js_unit_tests("unit_tests") {
- deps = [
- ":files_tooltip_unittest",
- ]
-}
diff --git a/chromium/ui/file_manager/file_manager/foreground/js/BUILD.gn b/chromium/ui/file_manager/file_manager/foreground/js/BUILD.gn
index d55d0cfd453..cabae49b59e 100644
--- a/chromium/ui/file_manager/file_manager/foreground/js/BUILD.gn
+++ b/chromium/ui/file_manager/file_manager/foreground/js/BUILD.gn
@@ -82,7 +82,6 @@ js_library("closure_compile_externs") {
"$externs_path/command_line_private.js",
"$externs_path/metrics_private.js",
"$externs_path/web_animations.js",
- "../../../externs/app_window_common.js",
"../../../externs/background/crostini.js",
"../../../externs/background/drive_sync_handler.js",
"../../../externs/background/file_browser_background.js",
diff --git a/chromium/ui/file_manager/file_manager/foreground/js/metadata/BUILD.gn b/chromium/ui/file_manager/file_manager/foreground/js/metadata/BUILD.gn
index 6f95c187a4b..e5c43cb1d90 100644
--- a/chromium/ui/file_manager/file_manager/foreground/js/metadata/BUILD.gn
+++ b/chromium/ui/file_manager/file_manager/foreground/js/metadata/BUILD.gn
@@ -19,7 +19,6 @@ group("closure_compile") {
js_type_check("closure_compile_module") {
deps = [
":byte_reader",
- ":closure_compile_externs",
":content_metadata_provider",
":exif_constants",
":exif_parser",
@@ -44,14 +43,6 @@ js_type_check("closure_compile_module") {
]
}
-js_library("closure_compile_externs") {
- sources = []
- externs_list = [
- "../../../../externs/app_window_common.js",
- "../../../../externs/platform.js",
- ]
-}
-
js_library("byte_reader") {
}
@@ -191,6 +182,7 @@ js_library("metadata_dispatcher") {
deps = [
":metadata_parser",
]
+ externs_list = [ "../../../../externs/platform.js" ]
}
js_library("metadata_item") {
diff --git a/chromium/ui/file_manager/file_manager/foreground/js/ui/BUILD.gn b/chromium/ui/file_manager/file_manager/foreground/js/ui/BUILD.gn
index a943c32272a..e9b135b7cb0 100644
--- a/chromium/ui/file_manager/file_manager/foreground/js/ui/BUILD.gn
+++ b/chromium/ui/file_manager/file_manager/foreground/js/ui/BUILD.gn
@@ -58,7 +58,6 @@ js_library("closure_compile_externs") {
externs_list = [
"$externs_path/metrics_private.js",
"$externs_path/web_animations.js",
- "../../../../externs/app_window_common.js",
"../../../../externs/background/drive_sync_handler.js",
"../../../../externs/background/file_browser_background.js",
"../../../../externs/background/file_operation_manager.js",
@@ -300,6 +299,18 @@ js_library("file_table_list") {
]
}
+js_unittest("file_table_list_unittest") {
+ deps = [
+ ":file_table_list",
+ ":file_table",
+ "../../../common/js:util",
+ "//ui/file_manager/base/js:test_error_reporting",
+ "//ui/webui/resources/js:webui_resource_test",
+ "//ui/file_manager/file_manager/background/js:mock_volume_manager",
+ "//ui/file_manager/file_manager/foreground/js/metadata:mock_metadata",
+ ]
+}
+
js_library("file_tap_handler") {
deps = [
"../../../common/js:util",
@@ -465,6 +476,7 @@ js_unit_tests("unit_tests") {
":file_table_unittest",
":file_tap_handler_unittest",
":list_container_unittest",
+ ":file_table_list_unittest",
":multi_menu_unittest",
]
}
diff --git a/chromium/ui/file_manager/file_manager/test/BUILD.gn b/chromium/ui/file_manager/file_manager/test/BUILD.gn
index 965a6843c40..682ecb3c75f 100644
--- a/chromium/ui/file_manager/file_manager/test/BUILD.gn
+++ b/chromium/ui/file_manager/file_manager/test/BUILD.gn
@@ -57,7 +57,6 @@ js_library("closure_compile_externs") {
"js/externs.js",
"$externs_path/command_line_private.js",
"$externs_path/metrics_private.js",
- "//ui/file_manager/externs/app_window_common.js",
"//ui/file_manager/externs/background/file_browser_background.js",
"//ui/file_manager/externs/background/progress_center.js",
"//ui/file_manager/externs/background/crostini.js",
diff --git a/chromium/ui/file_manager/video_player/js/BUILD.gn b/chromium/ui/file_manager/video_player/js/BUILD.gn
index 1090e8ac720..4730eeca9ad 100644
--- a/chromium/ui/file_manager/video_player/js/BUILD.gn
+++ b/chromium/ui/file_manager/video_player/js/BUILD.gn
@@ -3,8 +3,9 @@
# found in the LICENSE file.
import("//third_party/closure_compiler/compile_js.gni")
+import("//third_party/closure_compiler/js_unit_tests.gni")
-js_type_check("closure_compile") {
+js_type_check("closure_compile_module") {
deps = [
":background",
":closure_compile_externs",
@@ -13,6 +14,7 @@ js_type_check("closure_compile") {
":mouse_inactivity_watcher",
":video_player",
":video_player_metrics",
+ ":video_player_native_controls",
]
}
@@ -51,6 +53,22 @@ js_library("mouse_inactivity_watcher") {
}
js_library("video_player_native_controls") {
+ deps = [
+ "//ui/file_manager/base/js:app_util",
+ "//ui/file_manager/externs:file_manager_private",
+ "//ui/webui/resources/js:load_time_data",
+ "//ui/webui/resources/js:util",
+ ]
+ externs_list = [ "../../externs/platform.js" ]
+}
+
+js_unittest("video_player_native_controls_unittest") {
+ deps = [
+ ":video_player_native_controls",
+ "//ui/file_manager/base/js:app_util",
+ "//ui/file_manager/base/js:mock_chrome",
+ "//ui/webui/resources/js:webui_resource_test",
+ ]
}
js_library("video_player") {
@@ -78,3 +96,17 @@ js_library("video_player_metrics") {
"../../file_manager/common/js:metrics_base",
]
}
+
+js_unit_tests("unit_tests") {
+ deps = [
+ ":video_player_native_controls_unittest",
+ ]
+}
+
+group("closure_compile") {
+ testonly = true
+ deps = [
+ ":closure_compile_module",
+ ":unit_tests_type_check",
+ ]
+}
diff --git a/chromium/ui/file_manager/video_player/js/cast/BUILD.gn b/chromium/ui/file_manager/video_player/js/cast/BUILD.gn
index 7305df109ef..11b8e380e7c 100644
--- a/chromium/ui/file_manager/video_player/js/cast/BUILD.gn
+++ b/chromium/ui/file_manager/video_player/js/cast/BUILD.gn
@@ -20,7 +20,6 @@ js_library("closure_compile_externs") {
"$externs_path/chrome_extensions.js",
"$externs_path/media_player_private.js",
"$externs_path/mediasession.js",
- "../../../externs/app_window_common.js",
"../../../externs/background/volume_manager_factory.js",
"../../../externs/chrome_cast.js",
"../../../externs/platform.js",