diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:20:33 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:28:57 +0000 |
| commit | d17ea114e5ef69ad5d5d7413280a13e6428098aa (patch) | |
| tree | 2c01a75df69f30d27b1432467cfe7c1467a498da /chromium/ui/file_manager | |
| parent | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (diff) | |
| download | qtwebengine-chromium-d17ea114e5ef69ad5d5d7413280a13e6428098aa.tar.gz | |
BASELINE: Update Chromium to 67.0.3396.47
Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/ui/file_manager')
4 files changed, 37 insertions, 4 deletions
diff --git a/chromium/ui/file_manager/file_manager/background/js/compiled_resources2.gyp b/chromium/ui/file_manager/file_manager/background/js/compiled_resources2.gyp index 171eff0feb0..28942957372 100644 --- a/chromium/ui/file_manager/file_manager/background/js/compiled_resources2.gyp +++ b/chromium/ui/file_manager/file_manager/background/js/compiled_resources2.gyp @@ -209,10 +209,20 @@ # 'target_name': 'mock_progress_center', # 'includes': ['../../../compile_js2.gypi'], # }, -# { -# 'target_name': 'mock_volume_manager', -# 'includes': ['../../../compile_js2.gypi'], -# }, + { + 'target_name': 'mock_volume_manager', + 'dependencies': [ + '../../../externs/compiled_resources2.gyp:entry_location', + '../../../externs/compiled_resources2.gyp:volume_info_list', + '../../../externs/compiled_resources2.gyp:volume_info', + '../../../externs/compiled_resources2.gyp:volume_manager', + '../../common/js/compiled_resources2.gyp:mock_entry', + 'volume_info_impl', + 'volume_info_list_impl', + 'volume_manager_factory', + ], + 'includes': ['../../../compile_js2.gypi'], + }, { 'target_name': 'progress_center', 'dependencies': [ diff --git a/chromium/ui/file_manager/file_manager/common/js/compiled_resources2.gyp b/chromium/ui/file_manager/file_manager/common/js/compiled_resources2.gyp index a539058b7e8..370faaf31f3 100644 --- a/chromium/ui/file_manager/file_manager/common/js/compiled_resources2.gyp +++ b/chromium/ui/file_manager/file_manager/common/js/compiled_resources2.gyp @@ -59,6 +59,14 @@ 'includes': ['../../../compile_js2.gypi'], }, { + 'target_name': 'mock_entry', + 'dependencies': [ + '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert', + 'util', + ], + 'includes': ['../../../compile_js2.gypi'], + }, + { 'target_name': 'progress_center_common', 'includes': ['../../../compile_js2.gypi'], }, diff --git a/chromium/ui/file_manager/file_manager/foreground/js/ui/compiled_resources2.gyp b/chromium/ui/file_manager/file_manager/foreground/js/ui/compiled_resources2.gyp index 039fe8c86f3..645b490d7c6 100644 --- a/chromium/ui/file_manager/file_manager/foreground/js/ui/compiled_resources2.gyp +++ b/chromium/ui/file_manager/file_manager/foreground/js/ui/compiled_resources2.gyp @@ -268,6 +268,7 @@ 'dependencies': [ '../../../../externs/compiled_resources2.gyp:platform', '../../../../externs/compiled_resources2.gyp:volume_manager', + '../../../common/js/compiled_resources2.gyp:metrics', '../../../common/js/compiled_resources2.gyp:util', '../../../common/js/compiled_resources2.gyp:volume_manager_common', '../compiled_resources2.gyp:volume_manager_wrapper', @@ -309,6 +310,7 @@ 'dependencies': [ '../../../../externs/compiled_resources2.gyp:search_item', '../../../common/js/compiled_resources2.gyp:file_type', + '../../../common/js/compiled_resources2.gyp:metrics', '../../../common/js/compiled_resources2.gyp:util', '../../elements/compiled_resources2.gyp:files_toggle_ripple', '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert', diff --git a/chromium/ui/file_manager/file_manager/test/BUILD.gn b/chromium/ui/file_manager/file_manager/test/BUILD.gn new file mode 100644 index 00000000000..d37ac91f365 --- /dev/null +++ b/chromium/ui/file_manager/file_manager/test/BUILD.gn @@ -0,0 +1,13 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +action("create_test_main") { + script = "//ui/file_manager/file_manager/test/scripts/create_test_main.py" + output = "$target_gen_dir/../test.html" + deps = ["//ui/file_manager:resources"] + args = [ "--output=" + rebase_path(output, root_build_dir) ] + outputs = [ + output, + ] +} |