diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-18 14:10:49 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-18 13:53:24 +0000 |
commit | 813fbf95af77a531c57a8c497345ad2c61d475b3 (patch) | |
tree | 821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/ui/file_manager | |
parent | af6588f8d723931a298c995fa97259bb7f7deb55 (diff) | |
download | qtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz |
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/ui/file_manager')
8 files changed, 279 insertions, 23 deletions
diff --git a/chromium/ui/file_manager/audio_player/js/compiled_resources.gyp b/chromium/ui/file_manager/audio_player/js/compiled_resources.gyp new file mode 100644 index 00000000000..1f8f6f340ff --- /dev/null +++ b/chromium/ui/file_manager/audio_player/js/compiled_resources.gyp @@ -0,0 +1,44 @@ +# 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. +{ + 'targets': [ + { + 'target_name': 'background', + 'variables': { + 'depends': [ + '../../../../third_party/jstemplate/compiled_resources.gyp:jstemplate', + '../../../webui/resources/js/cr.js', + '../../../webui/resources/js/cr/event_target.js', + '../../../webui/resources/js/cr/ui.js', + '../../../webui/resources/js/cr/ui/array_data_model.js', + # Referenced in common/js/util.js. + '../../../webui/resources/js/cr/ui/dialogs.js', + '../../../webui/resources/js/load_time_data.js', + '../../../webui/resources/js/util.js', + '../../file_manager/common/js/util.js', + '../../file_manager/common/js/async_util.js', + '../../file_manager/common/js/file_type.js', + '../../file_manager/common/js/volume_manager_common.js', + '../../file_manager/background/js/app_window_wrapper.js', + '../../file_manager/background/js/background_base.js', + '../../file_manager/background/js/test_util_base.js', + '../../file_manager/background/js/volume_manager.js', + 'error_util.js', + 'background.js', + ], + 'externs': [ + '<(CLOSURE_DIR)/externs/chrome_send_externs.js', + '<(CLOSURE_DIR)/externs/chrome_extensions.js', + '<(CLOSURE_DIR)/externs/file_manager_private.js', + '../../externs/chrome_test.js', + '../../externs/platform.js', + ], + }, + 'includes': [ + '../../../../third_party/closure_compiler/compile_js.gypi' + ], + } + ], +} + diff --git a/chromium/ui/file_manager/file_manager.gyp b/chromium/ui/file_manager/file_manager.gyp index ec12f68839f..dc6da75abb7 100644 --- a/chromium/ui/file_manager/file_manager.gyp +++ b/chromium/ui/file_manager/file_manager.gyp @@ -41,11 +41,11 @@ 'FILE_MANAGER_IMPLEMENTATION', ], 'sources': [ + '<(grit_out_dir)/grit/file_manager_resources_map.cc', + '<(grit_out_dir)/grit/file_manager_resources_map.h', 'file_manager_export.h', 'file_manager_resource_util.cc', 'file_manager_resource_util.h', - '<(grit_out_dir)/grit/file_manager_resources_map.cc', - '<(grit_out_dir)/grit/file_manager_resources_map.h', ] }, ], diff --git a/chromium/ui/file_manager/file_manager/background/js/compiled_resources.gyp b/chromium/ui/file_manager/file_manager/background/js/compiled_resources.gyp index 743ef89f257..988642ec0a0 100644 --- a/chromium/ui/file_manager/file_manager/background/js/compiled_resources.gyp +++ b/chromium/ui/file_manager/file_manager/background/js/compiled_resources.gyp @@ -14,22 +14,34 @@ '../../../../webui/resources/js/cr/event_target.js', '../../../../webui/resources/js/cr/ui/array_data_model.js', '../../../../webui/resources/js/cr/ui/dialogs.js', + '../../common/js/lru_cache.js', '../../../image_loader/image_loader_client.js', '../../common/js/error_util.js', '../../common/js/async_util.js', + '../../common/js/file_type.js', + '../../common/js/metrics_base.js', + '../../common/js/metrics_events.js', + '../../common/js/metrics.js', '../../common/js/progress_center_common.js', '../../common/js/util.js', '../../common/js/volume_manager_common.js', + '../../common/js/importer_common.js', '../../foreground/js/ui/progress_center_panel.js', '../../foreground/js/progress_center_item_group.js', '../../foreground/js/metadata/byte_reader.js', 'app_window_wrapper.js', 'device_handler.js', 'drive_sync_handler.js', + 'duplicate_finder.js', 'file_operation_handler.js', 'file_operation_manager.js', + 'file_operation_util.js', 'import_history.js', + 'launcher_search.js', + 'media_import_handler.js', + 'media_scanner.js', 'progress_center.js', + 'task_queue.js', 'volume_manager.js', 'background_base.js', ], @@ -39,10 +51,13 @@ '<(CLOSURE_DIR)/externs/command_line_private.js', '<(CLOSURE_DIR)/externs/file_manager_private.js', '<(CLOSURE_DIR)/externs/metrics_private.js', + '../../../../../third_party/analytics/externs.js', '../../../externs/chrome_test.js', '../../../externs/connection.js', '../../../externs/css_rule.js', + '../../../externs/launcher_search_provider.js', '../../../externs/webview_tag.js', + '../../../externs/platform.js', '../../common/js/externs.js', ], }, diff --git a/chromium/ui/file_manager/file_manager/foreground/js/compiled_resources.gyp b/chromium/ui/file_manager/file_manager/foreground/js/compiled_resources.gyp index 1f53c2a6bf2..46fb00dbec2 100644 --- a/chromium/ui/file_manager/file_manager/foreground/js/compiled_resources.gyp +++ b/chromium/ui/file_manager/file_manager/foreground/js/compiled_resources.gyp @@ -7,6 +7,7 @@ 'target_name': 'main', 'variables': { 'depends': [ + '<@(cws_widget_container)', '../../../../../third_party/jstemplate/compiled_resources.gyp:jstemplate', '../../../../../ui/webui/resources/js/load_time_data.js', '../../../../../ui/webui/resources/js/cr.js', @@ -41,66 +42,101 @@ '../../../../../ui/webui/resources/js/cr/ui/context_menu_handler.js', '../../common/js/error_util.js', '../../common/js/async_util.js', + '../../common/js/file_type.js', '../../common/js/volume_manager_common.js', + '../../common/js/importer_common.js', '../../common/js/util.js', '../../common/js/progress_center_common.js', + '../../common/js/lru_cache.js', + '../../common/js/metrics_base.js', + '../../common/js/metrics_events.js', + '../../common/js/metrics.js', '../../background/js/file_operation_manager.js', + '../../background/js/file_operation_util.js', '../../background/js/file_operation_handler.js', '../../background/js/device_handler.js', '../../background/js/drive_sync_handler.js', + '../../background/js/duplicate_finder.js', '../../background/js/volume_manager.js', '../../background/js/progress_center.js', '../../background/js/app_window_wrapper.js', '../../background/js/import_history.js', + '../../background/js/launcher_search.js', + '../../background/js/media_import_handler.js', + '../../background/js/media_scanner.js', + '../../background/js/task_queue.js', '../../background/js/background_base.js', '../../background/js/background.js', '../../../image_loader/image_loader_client.js', - './metrics.js', + './metrics_start.js', './ui/combobutton.js', './ui/commandbutton.js', './ui/file_manager_dialog_base.js', - './app_installer.js', - './cws_container_client.js', + './app_state_controller.js', + './column_visibility_controller.js', './dialog_action_controller.js', + './dialog_type.js', './directory_contents.js', './directory_model.js', + './empty_folder_controller.js', './file_manager.js', './file_manager_commands.js', './file_selection.js', './file_tasks.js', './file_transfer_controller.js', - './file_type.js', './file_watcher.js', './folder_shortcuts_data_model.js', - './metadata/metadata_cache.js', + './gear_menu_controller.js', + './import_controller.js', + './launch_param.js', + './metadata/content_metadata_provider.js', + './metadata/external_metadata_provider.js', + './metadata/file_system_metadata_provider.js', + './metadata/metadata_cache_item.js', + './metadata/metadata_cache_set.js', + './metadata/metadata_item.js', + './metadata/metadata_model.js', + './metadata/multi_metadata_provider.js', + './metadata/new_metadata_provider.js', + './metadata/thumbnail_model.js', + './metadata_update_controller.js', './naming_controller.js', './navigation_list_model.js', './progress_center_item_group.js', './scan_controller.js', './search_controller.js', + './sort_menu_controller.js', './spinner_controller.js', './share_client.js', + './task_controller.js', + './toolbar_controller.js', './thumbnail_loader.js', + './list_thumbnail_loader.js', + './providers_model.js', + './ui/banners.js', './ui/conflict_dialog.js', './ui/default_action_dialog.js', './ui/dialog_footer.js', './ui/directory_tree.js', './ui/drag_selector.js', - './ui/drive_banners.js', + './ui/empty_folder.js', './ui/error_dialog.js', './ui/file_grid.js', + './ui/file_list_selection_model.js', './ui/file_manager_ui.js', './ui/file_table.js', + './ui/file_table_list.js', + './ui/gear_menu.js', './ui/list_container.js', './ui/location_line.js', './ui/multi_profile_share_dialog.js', - './ui/preview_panel.js', './ui/progress_center_panel.js', + './ui/providers_menu.js', './ui/scrollbar.js', './ui/search_box.js', './ui/share_dialog.js', './ui/suggest_apps_dialog.js', - './ui/tree.css.js', + './main_window_component.js', './volume_manager_wrapper.js', './metadata/byte_reader.js', ], @@ -110,17 +146,22 @@ '<(CLOSURE_DIR)/externs/command_line_private.js', '<(CLOSURE_DIR)/externs/file_manager_private.js', '<(CLOSURE_DIR)/externs/metrics_private.js', + '../../../../../third_party/analytics/externs.js', '../../../externs/chrome_echo_private.js', + '../../../externs/chrome_webstore_widget_private.js', '../../../externs/chrome_test.js', '../../../externs/connection.js', '../../../externs/css_rule.js', '../../../externs/html_menu_item_element.js', + '../../../externs/launcher_search_provider.js', '../../../externs/webview_tag.js', + '../../../externs/platform.js', '../../common/js/externs.js', ], }, 'includes': [ - '../../../../../third_party/closure_compiler/compile_js.gypi' + '../../../../../components/chrome_apps/webstore_widget/cws_widget/compiled_resources.gypi', + '../../../../../third_party/closure_compiler/compile_js.gypi', ], } ], diff --git a/chromium/ui/file_manager/file_manager/foreground/js/metadata/compiled_resources.gyp b/chromium/ui/file_manager/file_manager/foreground/js/metadata/compiled_resources.gyp new file mode 100644 index 00000000000..15bcbaf9991 --- /dev/null +++ b/chromium/ui/file_manager/file_manager/foreground/js/metadata/compiled_resources.gyp @@ -0,0 +1,30 @@ +# 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. +{ + 'targets': [ + { + 'target_name': 'metadata_dispatcher', + 'variables': { + 'depends': [ + 'metadata_parser.js', + 'byte_reader.js', + 'exif_parser.js', + 'exif_constants.js', + 'image_parsers.js', + 'mpeg_parser.js', + 'id3_parser.js', + 'function_sequence.js', + 'function_parallel.js', + ], + 'externs': [ + '../../../../externs/exif_entry.js', + '../../../../externs/platform_worker.js', + ] + }, + 'includes': [ + '../../../../../../third_party/closure_compiler/compile_js.gypi' + ], + } + ] +} diff --git a/chromium/ui/file_manager/gallery/js/compiled_resources.gyp b/chromium/ui/file_manager/gallery/js/compiled_resources.gyp index f6ce0392ffb..2152717b53b 100644 --- a/chromium/ui/file_manager/gallery/js/compiled_resources.gyp +++ b/chromium/ui/file_manager/gallery/js/compiled_resources.gyp @@ -10,20 +10,27 @@ '../../../../third_party/jstemplate/compiled_resources.gyp:jstemplate', '../../../webui/resources/js/cr.js', '../../../webui/resources/js/cr/event_target.js', + '../../../webui/resources/js/cr/ui.js', '../../../webui/resources/js/cr/ui/array_data_model.js', '../../../webui/resources/js/cr/ui/dialogs.js', '../../../webui/resources/js/load_time_data.js', + '../../../webui/resources/js/util.js', '../../file_manager/common/js/util.js', '../../file_manager/common/js/async_util.js', '../../file_manager/common/js/volume_manager_common.js', - '../../file_manager/background/js/volume_manager.js', '../../file_manager/common/js/error_util.js', - '../../file_manager/foreground/js/file_type.js' + '../../file_manager/common/js/file_type.js', + '../../file_manager/background/js/app_window_wrapper.js', + '../../file_manager/background/js/background_base.js', + '../../file_manager/background/js/volume_manager.js', ], 'externs': [ '<(CLOSURE_DIR)/externs/chrome_send_externs.js', '<(CLOSURE_DIR)/externs/chrome_extensions.js', '<(CLOSURE_DIR)/externs/file_manager_private.js', + '../../externs/chrome_test.js', + '../../externs/gallery_background.js', + '../../externs/platform.js', ], }, 'includes': [ @@ -31,19 +38,84 @@ ], }, { - 'target_name': 'gallery_scripts', + 'target_name': 'gallery', 'variables': { 'depends': [ '../../../../third_party/jstemplate/compiled_resources.gyp:jstemplate', - '../../file_manager/background/js/volume_manager.js', + '../../../webui/resources/js/util.js', + '../../../webui/resources/js/event_tracker.js', + '../../../webui/resources/js/load_time_data.js', + '../../../webui/resources/js/cr.js', + '../../../webui/resources/js/cr/ui.js', + '../../../webui/resources/js/cr/event_target.js', + '../../../webui/resources/js/cr/ui/touch_handler.js', + '../../../webui/resources/js/cr/ui/array_data_model.js', + '../../../webui/resources/js/cr/ui/dialogs.js', + '../../../webui/resources/js/cr/ui/list_item.js', + '../../../webui/resources/js/cr/ui/list_selection_model.js', + '../../../webui/resources/js/cr/ui/list_single_selection_model.js', + '../../../webui/resources/js/cr/ui/list_selection_controller.js', + '../../../webui/resources/js/cr/ui/list.js', + '../../../webui/resources/js/cr/ui/grid.js', + '../../../webui/resources/js/i18n_template_no_process.js', '../../file_manager/common/js/volume_manager_common.js', + '../../file_manager/common/js/lru_cache.js', '../../file_manager/common/js/async_util.js', + '../../file_manager/common/js/file_type.js', + '../../file_manager/common/js/util.js', + '../../file_manager/common/js/metrics_base.js', + '../../file_manager/common/js/metrics.js', + '../../file_manager/foreground/js/metrics_start.js', + '../../file_manager/foreground/js/metadata/content_metadata_provider.js', + '../../file_manager/foreground/js/metadata/exif_constants.js', + '../../file_manager/foreground/js/metadata/external_metadata_provider.js', + '../../file_manager/foreground/js/metadata/file_system_metadata_provider.js', + '../../file_manager/foreground/js/metadata/metadata_cache_item.js', + '../../file_manager/foreground/js/metadata/metadata_cache_set.js', + '../../file_manager/foreground/js/metadata/metadata_item.js', + '../../file_manager/foreground/js/metadata/metadata_model.js', + '../../file_manager/foreground/js/metadata/multi_metadata_provider.js', + '../../file_manager/foreground/js/metadata/new_metadata_provider.js', + '../../file_manager/foreground/js/metadata/thumbnail_model.js', + '../../file_manager/foreground/js/mouse_inactivity_watcher.js', + '../../file_manager/foreground/js/share_client.js', + '../../file_manager/foreground/js/thumbnail_loader.js', + '../../file_manager/foreground/js/ui/file_manager_dialog_base.js', + '../../file_manager/foreground/js/ui/share_dialog.js', + '../../file_manager/foreground/js/volume_manager_wrapper.js', + '../../file_manager/background/js/volume_manager.js', + '../../image_loader/image_loader_client.js', + './image_editor/commands.js', + './image_editor/exif_encoder.js', + './image_editor/filter.js', + './image_editor/image_adjust.js', + './image_editor/image_buffer.js', + './image_editor/image_editor.js', + './image_editor/image_encoder.js', + './image_editor/image_transform.js', + './image_editor/image_util.js', + './image_editor/image_view.js', + './image_editor/viewport.js', + './entry_list_watcher.js', + './error_banner.js', + './gallery_data_model.js', + './gallery_item.js', + './gallery_util.js', + './mosaic_mode.js', + './ribbon.js', + './slide_mode.js', ], 'externs': [ '<(CLOSURE_DIR)/externs/chrome_send_externs.js', '<(CLOSURE_DIR)/externs/chrome_extensions.js', '<(CLOSURE_DIR)/externs/file_manager_private.js', '<(CLOSURE_DIR)/externs/metrics_private.js', + '../../../../third_party/analytics/externs.js', + '../../externs/chrome_test.js', + '../../externs/exif_entry.js', + '../../externs/gallery_foreground.js', + '../../externs/platform.js', + '../../externs/webview_tag.js', ], }, 'includes': [ @@ -52,5 +124,3 @@ } ], } - - diff --git a/chromium/ui/file_manager/image_loader/compiled_resources.gyp b/chromium/ui/file_manager/image_loader/compiled_resources.gyp index c6488faa751..7a28a3ca42c 100644 --- a/chromium/ui/file_manager/image_loader/compiled_resources.gyp +++ b/chromium/ui/file_manager/image_loader/compiled_resources.gyp @@ -7,15 +7,24 @@ 'target_name': 'background', 'variables': { 'depends': [ - 'image_loader.js', + '../../webui/resources/js/assert.js', + '../file_manager/common/js/file_type.js', + '../file_manager/common/js/metrics_base.js', + '../file_manager/common/js/metrics.js', + '../file_manager/common/js/metrics_events.js', + "../file_manager/foreground/js/metadata/image_orientation.js", 'cache.js', - 'scheduler.js', + 'image_loader.js', + 'piex_loader.js', 'request.js', + 'scheduler.js', ], 'externs': [ '<(CLOSURE_DIR)/externs/chrome_send_externs.js', '<(CLOSURE_DIR)/externs/chrome_extensions.js', '<(CLOSURE_DIR)/externs/file_manager_private.js', + '<(CLOSURE_DIR)/externs/metrics_private.js', + '../../../third_party/analytics/externs.js', ], }, 'includes': [ @@ -24,5 +33,3 @@ } ], } - - diff --git a/chromium/ui/file_manager/video_player/js/compiled_resources.gyp b/chromium/ui/file_manager/video_player/js/compiled_resources.gyp index e6b706a5cb6..91c7ce6c1d8 100644 --- a/chromium/ui/file_manager/video_player/js/compiled_resources.gyp +++ b/chromium/ui/file_manager/video_player/js/compiled_resources.gyp @@ -7,15 +7,23 @@ 'target_name': 'background', 'variables': { 'depends': [ + '../../../../third_party/jstemplate/compiled_resources.gyp:jstemplate', '../../../webui/resources/js/cr.js', '../../../webui/resources/js/cr/event_target.js', + '../../../webui/resources/js/cr/ui.js', '../../../webui/resources/js/cr/ui/array_data_model.js', + # Referenced in common/js/util.js. + '../../../webui/resources/js/cr/ui/dialogs.js', '../../../webui/resources/js/load_time_data.js', + '../../../webui/resources/js/util.js', '../../file_manager/common/js/util.js', '../../file_manager/common/js/async_util.js', + '../../file_manager/common/js/file_type.js', '../../file_manager/common/js/volume_manager_common.js', + '../../file_manager/background/js/app_window_wrapper.js', + '../../file_manager/background/js/background_base.js', '../../file_manager/background/js/volume_manager.js', - '../../file_manager/foreground/js/file_type.js', + '../../file_manager/background/js/test_util_base.js', 'error_util.js', 'test_util.js', ], @@ -23,6 +31,8 @@ '<(CLOSURE_DIR)/externs/chrome_send_externs.js', '<(CLOSURE_DIR)/externs/chrome_extensions.js', '<(CLOSURE_DIR)/externs/file_manager_private.js', + '../../externs/chrome_test.js', + '../../externs/platform.js', ], }, 'includes': [ @@ -30,16 +40,55 @@ ], }, { - 'target_name': 'video_player_scripts', + 'target_name': 'video_player', 'variables': { 'depends': [ + '../../../../third_party/jstemplate/compiled_resources.gyp:jstemplate', + 'error_util.js', + '../../file_manager/common/js/metrics_base.js', + 'video_player_metrics.js', + '../../../webui/resources/js/cr.js', + '../../../webui/resources/js/load_time_data.js', + '../../../webui/resources/js/event_tracker.js', + '../../../webui/resources/js/util.js', + '../../../webui/resources/js/cr/ui.js', + '../../../webui/resources/js/cr/event_target.js', + '../../../webui/resources/js/cr/ui/array_data_model.js', + '../../../webui/resources/js/cr/ui/position_util.js', + '../../../webui/resources/js/cr/ui/menu_item.js', + '../../../webui/resources/js/cr/ui/menu.js', + '../../../webui/resources/js/cr/ui/menu_button.js', + '../../../webui/resources/js/cr/ui/command.js', + '../../../webui/resources/js/cr/ui/context_menu_handler.js', + # Referenced in common/js/util.js. + # TODO(yawano): Remove dependency to cr/ui/dialogs from common/js/util.js. + '../../../webui/resources/js/cr/ui/dialogs.js', + '../../../webui/resources/js/i18n_template_no_process.js', + '../../file_manager/common/js/async_util.js', + '../../file_manager/common/js/file_type.js', + '../../file_manager/common/js/util.js', + '../../file_manager/common/js/volume_manager_common.js', + '../../file_manager/foreground/js/mouse_inactivity_watcher.js', + '../../file_manager/foreground/js/volume_manager_wrapper.js', + # Referenced in volume_manager_wrapper.js. + '../../file_manager/background/js/volume_manager.js', + 'cast/cast_extension_discoverer.js', + 'cast/cast_video_element.js', + 'cast/media_manager.js', + 'cast/caster.js', + 'media_controls.js', ], 'externs': [ '<(CLOSURE_DIR)/externs/chrome_send_externs.js', '<(CLOSURE_DIR)/externs/chrome_extensions.js', '<(CLOSURE_DIR)/externs/file_manager_private.js', '<(CLOSURE_DIR)/externs/media_player_private.js', + '<(CLOSURE_DIR)/externs/metrics_private.js', + '../../externs/chrome_test.js', '../../externs/chrome_cast.js', + '../../externs/chrome_webstore_widget_private.js', + '../../externs/platform.js', + '../../externs/video_player_foreground.js', ], }, 'includes': [ |