diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-31 16:33:43 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-06 16:33:22 +0000 |
| commit | da51f56cc21233c2d30f0fe0d171727c3102b2e0 (patch) | |
| tree | 4e579ab70ce4b19bee7984237f3ce05a96d59d83 /chromium/ui/file_manager | |
| parent | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (diff) | |
| download | qtwebengine-chromium-da51f56cc21233c2d30f0fe0d171727c3102b2e0.tar.gz | |
BASELINE: Update Chromium to 65.0.3525.40
Also imports missing submodules
Change-Id: I36901b7c6a325cda3d2c10cedb2186c25af3b79b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/ui/file_manager')
| -rw-r--r-- | chromium/ui/file_manager/compile_js2.gypi | 3 | ||||
| -rw-r--r-- | chromium/ui/file_manager/file_manager/background/js/compiled_resources2.gyp | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/chromium/ui/file_manager/compile_js2.gypi b/chromium/ui/file_manager/compile_js2.gypi index 3c54a8eafb7..0ddfd0524a3 100644 --- a/chromium/ui/file_manager/compile_js2.gypi +++ b/chromium/ui/file_manager/compile_js2.gypi @@ -8,5 +8,8 @@ 'warning_level=VERBOSE', ], }, + 'dependencies': [ + '<(EXTERNS_GYP):file_manager_private' + ], 'includes': ['../../third_party/closure_compiler/compile_js2.gypi'], } 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 6ac87436c12..171eff0feb0 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 @@ -174,6 +174,7 @@ '../../../externs/background/compiled_resources2.gyp:import_runner', '../../common/js/compiled_resources2.gyp:importer_common', '../../common/js/compiled_resources2.gyp:metrics', + 'drive_sync_handler', 'import_history', 'media_scanner', 'progress_center', |