BASELINE: Update Chromium to 58.0.3029.54

Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

15 files changed, 422 insertions, 478 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
deleted file mode 100644
index f6cdc577d86..00000000000
--- a/chromium/ui/file_manager/audio_player/js/compiled_resources.gyp
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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',
-          '../../../webui/resources/js/load_time_data.js',
-          '../../../webui/resources/js/promise_resolver.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/metrics_base.js',
-          '../../file_manager/common/js/metrics_events.js',
-          '../../file_manager/common/js/metrics.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/entry_location_impl.js',
-          '../../file_manager/background/js/volume_info_impl.js',
-          '../../file_manager/background/js/volume_info_list_impl.js',
-          '../../file_manager/background/js/volume_manager_factory.js',
-          '../../file_manager/background/js/volume_manager_impl.js',
-          '../../file_manager/background/js/volume_manager_util.js',
-          '../../file_manager/background/js/test_util_base.js',
-          'error_util.js',
-          'test_util.js',
-        ],
-        'externs': [
-          '<(EXTERNS_DIR)/chrome_send.js',
-          '<(EXTERNS_DIR)/chrome_extensions.js',
-          '<(EXTERNS_DIR)/file_manager_private.js',
-          '<(EXTERNS_DIR)/metrics_private.js',
-          '../../../../third_party/analytics/externs.js',
-          '../../externs/chrome_test.js',
-          '../../externs/entry_location.js',
-          '../../externs/es6_workaround.js',
-          '../../externs/platform.js',
-          '../../externs/volume_info.js',
-          '../../externs/volume_info_list.js',
-          '../../externs/volume_manager.js',
-        ],
-      },
-      'includes': [
-        '../../compile_js.gypi',
-      ],
-    },
-    {
-      'target_name': 'audio_player',
-      'variables': {
-        'depends': [
-          '../../../../third_party/jstemplate/compiled_resources.gyp:jstemplate',
-          '../../../../third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior/iron-a11y-keys-behavior-extracted.js',
-          '../../../../third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-button-state-extracted.js',
-          '../../../../third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-control-state-extracted.js',
-          '../../../../third_party/polymer/v1_0/components-chromium/iron-form-element-behavior/iron-form-element-behavior-extracted.js',
-          '../../../../third_party/polymer/v1_0/components-chromium/iron-range-behavior/iron-range-behavior-extracted.js',
-          '../../../../third_party/polymer/v1_0/components-chromium/paper-behaviors/paper-inky-focus-behavior-extracted.js',
-          '../../../../third_party/polymer/v1_0/components-chromium/paper-behaviors/paper-ripple-behavior-extracted.js',
-          '../../../../third_party/polymer/v1_0/components-chromium/paper-progress/paper-progress-extracted.js',
-          '../../../../third_party/polymer/v1_0/components-chromium/paper-ripple/paper-ripple-extracted.js',
-          '../../../../third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider-extracted.js',
-          '../../../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/promise_resolver.js',
-          '../../../webui/resources/js/util.js',
-          '../../file_manager/common/js/async_util.js',
-          '../../file_manager/common/js/file_type.js',
-          '../../file_manager/common/js/lru_cache.js',
-          '../../file_manager/common/js/metrics_base.js',
-          '../../file_manager/common/js/metrics_events.js',
-          '../../file_manager/common/js/metrics.js',
-          '../../file_manager/common/js/util.js',
-          '../../file_manager/common/js/volume_manager_common.js',
-          '../../file_manager/foreground/js/metadata/content_metadata_provider.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/metadata_provider.js',
-          '../../file_manager/foreground/js/metadata/metadata_request.js',
-          '../../file_manager/foreground/js/metadata/multi_metadata_provider.js',
-          '../../file_manager/foreground/js/metadata/thumbnail_model.js',
-          '../../file_manager/foreground/js/volume_manager_wrapper.js',
-          '../elements/control_panel.js',
-          '../elements/track_info_panel.js',
-          '../elements/track_list.js',
-          '../elements/audio_player.js',
-          '../elements/repeat_button.js',
-        ],
-        'externs': [
-          '<(EXTERNS_DIR)/chrome_extensions.js',
-          '<(EXTERNS_DIR)/chrome_send.js',
-          '<(EXTERNS_DIR)/file_manager_private.js',
-          '<(EXTERNS_DIR)/metrics_private.js',
-          '../../../../third_party/analytics/externs.js',
-          '../../externs/app_window_common.js',
-          '../../externs/audio_player_foreground.js',
-          '../../externs/background_window_common.js',
-          '../../externs/chrome_test.js',
-          '../../externs/entry_location.js',
-          '../../externs/es6_workaround.js',
-          '../../externs/platform.js',
-          '../../externs/volume_info.js',
-          '../../externs/volume_info_list.js',
-          '../../externs/volume_manager.js',
-        ],
-      },
-      'includes': [
-        '../../compile_js.gypi',
-      ],
-    }
-  ],
-}
diff --git a/chromium/ui/file_manager/audio_player/js/compiled_resources2.gyp b/chromium/ui/file_manager/audio_player/js/compiled_resources2.gyp
index 933243aad71..cb59f565426 100644
--- a/chromium/ui/file_manager/audio_player/js/compiled_resources2.gyp
+++ b/chromium/ui/file_manager/audio_player/js/compiled_resources2.gyp
@@ -3,14 +3,30 @@
 # found in the LICENSE file.
 {
   'targets': [
-#    {
-#      'target_name': 'audio_player',
-#      'includes': ['../../compile_js2.gypi'],
-#    },
-#    {
-#      'target_name': 'background',
-#      'includes': ['../../compile_js2.gypi'],
-#    },
+    {
+      'target_name': 'audio_player',
+      'dependencies': [
+        '../../externs/compiled_resources2.gyp:audio_player_foreground',
+        '../../file_manager/common/js/compiled_resources2.gyp:util',
+        '../../file_manager/foreground/js/compiled_resources2.gyp:volume_manager_wrapper',
+        '../../file_manager/foreground/js/metadata/compiled_resources2.gyp:content_metadata_provider',
+        '../../file_manager/foreground/js/metadata/compiled_resources2.gyp:metadata_model',
+        '../elements/compiled_resources2.gyp:audio_player',
+        '../elements/compiled_resources2.gyp:track_list',
+        '<(EXTERNS_GYP):file_manager_private',
+      ],
+      'includes': ['../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'background',
+      'dependencies': [
+        '../../file_manager/background/js/compiled_resources2.gyp:app_window_wrapper',
+        '../../file_manager/background/js/compiled_resources2.gyp:background_base',
+        '../../file_manager/common/js/compiled_resources2.gyp:file_type',
+        '../../file_manager/common/js/compiled_resources2.gyp:util',
+      ],
+      'includes': ['../../compile_js2.gypi'],
+    },
     {
       'target_name': 'error_util',
       'includes': ['../../compile_js2.gypi'],
diff --git a/chromium/ui/file_manager/compiled_resources2.gyp b/chromium/ui/file_manager/compiled_resources2.gyp
index 5ea03a67595..0b8654625ec 100644
--- a/chromium/ui/file_manager/compiled_resources2.gyp
+++ b/chromium/ui/file_manager/compiled_resources2.gyp
@@ -15,7 +15,9 @@
         'file_manager/foreground/js/compiled_resources2.gyp:*',
         'file_manager/foreground/js/metadata/compiled_resources2.gyp:*',
         'gallery/js/compiled_resources2.gyp:*',
+        'gallery/js/image_editor/compiled_resources2.gyp:*',
         'image_loader/compiled_resources2.gyp:*',
+        'video_player/js/cast/compiled_resources2.gyp:*',
         'video_player/js/compiled_resources2.gyp:*',
       ],
     },
diff --git a/chromium/ui/file_manager/externs/compiled_resources2.gyp b/chromium/ui/file_manager/externs/compiled_resources2.gyp
index ebfed7e5e2a..77d9dcf132a 100644
--- a/chromium/ui/file_manager/externs/compiled_resources2.gyp
+++ b/chromium/ui/file_manager/externs/compiled_resources2.gyp
@@ -84,6 +84,10 @@
       'includes': ['../../../third_party/closure_compiler/include_js.gypi'],
     },
     {
+      'target_name': 'gallery_event',
+      'includes': ['../../../third_party/closure_compiler/include_js.gypi'],
+    },
+    {
       'target_name': 'gallery_foreground',
       'includes': ['../../../third_party/closure_compiler/include_js.gypi'],
     },
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
deleted file mode 100644
index a65581be5c7..00000000000
--- a/chromium/ui/file_manager/file_manager/background/js/compiled_resources.gyp
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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/load_time_data.js',
-          '../../../../webui/resources/js/cr.js',
-          '../../../../webui/resources/js/cr/ui.js',
-          '../../../../webui/resources/js/promise_resolver.js',
-          '../../../../webui/resources/js/util.js',
-          '../../../../webui/resources/js/cr/event_target.js',
-          '../../../../webui/resources/js/cr/ui/array_data_model.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',
-          'entry_location_impl.js',
-          'file_operation_handler.js',
-          'file_operation_manager.js',
-          'file_operation_util.js',
-          'import_history.js',
-          'launcher_search.js',
-          'task_queue.js',
-          'media_import_handler.js',
-          'media_scanner.js',
-          'progress_center.js',
-          'volume_info_impl.js',
-          'volume_info_list_impl.js',
-          'volume_manager_factory.js',
-          'volume_manager_impl.js',
-          'volume_manager_util.js',
-          'background_base.js',
-        ],
-        'externs': [
-          '<(EXTERNS_DIR)/chrome_extensions.js',
-          '<(EXTERNS_DIR)/chrome_send.js',
-          '<(EXTERNS_DIR)/command_line_private.js',
-          '<(EXTERNS_DIR)/file_manager_private.js',
-          '<(EXTERNS_DIR)/metrics_private.js',
-          '../../../../../third_party/analytics/externs.js',
-          '../../../externs/background_window.js',
-          '../../../externs/chrome_test.js',
-          '../../../externs/connection.js',
-          '../../../externs/css_rule.js',
-          '../../../externs/entry_location.js',
-          '../../../externs/es6_workaround.js',
-          '../../../externs/file_operation_progress_event.js',
-          '../../../externs/launcher_search_provider.js',
-          '../../../externs/webview_tag.js',
-          '../../../externs/platform.js',
-          '../../../externs/volume_info.js',
-          '../../../externs/volume_info_list.js',
-          '../../../externs/volume_manager.js',
-        ],
-      },
-      'includes': [
-        '../../../compile_js.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 da056c2ca7f..7b8d0bd05ec 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
@@ -3,18 +3,59 @@
 # found in the LICENSE file.
 {
   'targets': [
-#    {
-#      'target_name': 'app_window_wrapper',
-#      'includes': ['../../../compile_js2.gypi'],
-#    },
-#    {
-#      'target_name': 'background',
-#      'includes': ['../../../compile_js2.gypi'],
-#    },
-#    {
-#      'target_name': 'background_base',
-#      'includes': ['../../../compile_js2.gypi'],
-#    },
+    {
+      'target_name': 'app_window_wrapper',
+      'dependencies': [
+        '../../common/js/compiled_resources2.gyp:async_util',
+        '../../common/js/compiled_resources2.gyp:util',
+        '<(EXTERNS_GYP):chrome_extensions',
+        'app_windows',
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'app_windows',
+      'dependencies': [
+        '<(EXTERNS_GYP):chrome_extensions',
+        '../../../externs/compiled_resources2.gyp:app_window_common'
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'background',
+      'dependencies': [
+        '../../../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',
+        '<(EXTERNS_GYP):chrome_extensions',
+        'app_windows',
+        'background_base',
+        'device_handler',
+        'drive_sync_handler',
+        'duplicate_finder',
+        'file_operation_handler',
+        'file_operation_manager',
+        'import_history',
+        'launcher',
+        'launcher_search',
+        'media_import_handler',
+        'progress_center',
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'background_base',
+      'dependencies': [
+        '../../common/js/compiled_resources2.gyp:util',
+        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
+        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:load_time_data',
+        '<(EXTERNS_GYP):file_manager_private',
+        'app_windows',
+        'volume_manager_factory',
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
     {
       'target_name': 'device_handler',
       'dependencies': [
@@ -96,10 +137,26 @@
       ],
       'includes': ['../../../compile_js2.gypi'],
     },
-#    {
-#      'target_name': 'launcher_search',
-#      'includes': ['../../../compile_js2.gypi'],
-#    },
+    {
+      'target_name': 'launcher',
+      'dependencies': [
+        'app_window_wrapper',
+        'app_windows',
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'launcher_search',
+      'dependencies': [
+        '../../../externs/compiled_resources2.gyp:launcher_search_provider',
+        '../../common/js/compiled_resources2.gyp:file_type',
+        '../../common/js/compiled_resources2.gyp:util',
+        '<(EXTERNS_GYP):file_manager_private',
+        'launcher',
+        'volume_manager_factory',
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
     {
       'target_name': 'media_import_handler',
       'dependencies': [
diff --git a/chromium/ui/file_manager/file_manager/foreground/elements/compiled_resources2.gyp b/chromium/ui/file_manager/file_manager/foreground/elements/compiled_resources2.gyp
index 85e2919eb95..1724032697e 100644
--- a/chromium/ui/file_manager/file_manager/foreground/elements/compiled_resources2.gyp
+++ b/chromium/ui/file_manager/file_manager/foreground/elements/compiled_resources2.gyp
@@ -29,8 +29,8 @@
     {
       'target_name': 'files_ripple',
       'dependencies': [
-        '<(DEPTH)/third_party/polymer/v1_0/components-chromium/paper-ripple/compiled_resources2.gyp:paper-ripple-extracted',
         '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
+        '<(EXTERNS_GYP):web_animations',
       ],
       'includes': ['../../../compile_js2.gypi'],
     },
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 98461e7b268..37260ea40fe 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
@@ -61,7 +61,9 @@
           '../../background/js/duplicate_finder.js',
           '../../background/js/progress_center.js',
           '../../background/js/app_window_wrapper.js',
+          '../../background/js/app_windows.js',
           '../../background/js/import_history.js',
+          '../../background/js/launcher.js',
           '../../background/js/launcher_search.js',
           '../../background/js/task_queue.js',
           '../../background/js/media_import_handler.js',
@@ -168,6 +170,7 @@
           '<(EXTERNS_DIR)/command_line_private.js',
           '<(EXTERNS_DIR)/file_manager_private.js',
           '<(EXTERNS_DIR)/metrics_private.js',
+          '<(EXTERNS_DIR)/web_animations.js',
           '../../../../../third_party/analytics/externs.js',
           '../../../externs/background_window.js',
           '../../../externs/background_window_common.js',
@@ -179,6 +182,7 @@
           '../../../externs/directory_change_event.js',
           '../../../externs/entry_location.js',
           '../../../externs/es6_workaround.js',
+          '../../../externs/file_browser_background.js',
           '../../../externs/file_operation_progress_event.js',
           '../../../externs/html_menu_item_element.js',
           '../../../externs/launcher_search_provider.js',
diff --git a/chromium/ui/file_manager/file_manager/foreground/js/compiled_resources2.gyp b/chromium/ui/file_manager/file_manager/foreground/js/compiled_resources2.gyp
index e4aeef0ef09..a4cc5dc96cd 100644
--- a/chromium/ui/file_manager/file_manager/foreground/js/compiled_resources2.gyp
+++ b/chromium/ui/file_manager/file_manager/foreground/js/compiled_resources2.gyp
@@ -123,10 +123,10 @@
 #      'target_name': 'metrics_start',
 #      'includes': ['../../../compile_js2.gypi'],
 #    },
-#    {
-#      'target_name': 'mouse_inactivity_watcher',
-#      'includes': ['../../../compile_js2.gypi'],
-#    },
+    {
+      'target_name': 'mouse_inactivity_watcher',
+      'includes': ['../../../compile_js2.gypi'],
+    },
 #    {
 #      'target_name': 'naming_controller',
 #      'includes': ['../../../compile_js2.gypi'],
@@ -183,10 +183,16 @@
 #      'target_name': 'task_controller',
 #      'includes': ['../../../compile_js2.gypi'],
 #    },
-#    {
-#      'target_name': 'thumbnail_loader',
-#      'includes': ['../../../compile_js2.gypi'],
-#    },
+    {
+      'target_name': 'thumbnail_loader',
+      'dependencies': [
+        '../../../image_loader/compiled_resources2.gyp:image_loader_client',
+        '../../common/js/compiled_resources2.gyp:file_type',
+        '../../common/js/compiled_resources2.gyp:util',
+        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
 #    {
 #      'target_name': 'toolbar_controller',
 #      'includes': ['../../../compile_js2.gypi'],
diff --git a/chromium/ui/file_manager/gallery/js/compiled_resources.gyp b/chromium/ui/file_manager/gallery/js/compiled_resources.gyp
index 6a4304992f7..9136a67922d 100644
--- a/chromium/ui/file_manager/gallery/js/compiled_resources.gyp
+++ b/chromium/ui/file_manager/gallery/js/compiled_resources.gyp
@@ -24,6 +24,7 @@
           '../../file_manager/common/js/metrics_events.js',
           '../../file_manager/common/js/metrics.js',
           '../../file_manager/background/js/app_window_wrapper.js',
+          '../../file_manager/background/js/app_windows.js',
           '../../file_manager/background/js/background_base.js',
           '../../file_manager/background/js/entry_location_impl.js',
           '../../file_manager/background/js/volume_info_impl.js',
@@ -123,17 +124,20 @@
           '../../file_manager/foreground/js/volume_manager_wrapper.js',
           '../../image_loader/image_loader_client.js',
           './image_editor/image_util.js',
+          './image_editor/image_loader.js',
           './image_editor/viewport.js',
           './image_editor/image_buffer.js',
           './image_editor/image_view.js',
           './image_editor/commands.js',
           './image_editor/image_editor.js',
+          './image_editor/image_editor_prompt.js',
           './image_editor/image_transform.js',
           './image_editor/image_adjust.js',
           './image_editor/image_resize.js',
           './image_editor/filter.js',
           './image_editor/image_encoder.js',
           './image_editor/exif_encoder.js',
+          './gallery_constants.js',
           './dimmable_ui_controller.js',
           './entry_list_watcher.js',
           './error_banner.js',
@@ -149,6 +153,7 @@
           '<(EXTERNS_DIR)/chrome_send.js',
           '<(EXTERNS_DIR)/file_manager_private.js',
           '<(EXTERNS_DIR)/metrics_private.js',
+          '<(EXTERNS_DIR)/web_animations.js',
           '../../../../third_party/analytics/externs.js',
           '../../../../third_party/closure_compiler/externs/polymer-1.0.js',
           '../../externs/app_window_common.js',
diff --git a/chromium/ui/file_manager/gallery/js/compiled_resources2.gyp b/chromium/ui/file_manager/gallery/js/compiled_resources2.gyp
index ce842523bdc..d2859670919 100644
--- a/chromium/ui/file_manager/gallery/js/compiled_resources2.gyp
+++ b/chromium/ui/file_manager/gallery/js/compiled_resources2.gyp
@@ -1,58 +1,128 @@
 # Copyright 2016 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.
+# TODO(oka): Compile all the targets.
 {
   'targets': [
 #    {
 #      'target_name': 'background',
 #      'includes': ['../../compile_js2.gypi'],
 #    },
-#    {
-#      'target_name': 'dimmable_ui_controller',
-#      'includes': ['../../compile_js2.gypi'],
-#    },
-#    {
-#      'target_name': 'entry_list_watcher',
-#      'includes': ['../../compile_js2.gypi'],
-#    },
-#    {
-#      'target_name': 'error_banner',
-#      'includes': ['../../compile_js2.gypi'],
-#    },
+    {
+      'target_name': 'dimmable_ui_controller',
+      'dependencies': [
+        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
+        '<(EXTERNS_GYP):chrome_extensions',
+        'gallery_constants',
+        'image_editor/compiled_resources2.gyp:image_editor_prompt',
+      ],
+      'includes': ['../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'entry_list_watcher',
+      'dependencies': [
+        '../../externs/compiled_resources2.gyp:platform',
+        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
+        '<(DEPTH)/ui/webui/resources/js/cr/ui/compiled_resources2.gyp:array_data_model',
+        '<(EXTERNS_GYP):file_manager_private',
+      ],
+      'includes': ['../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'error_banner',
+      'dependencies': [
+        '../../file_manager/common/js/compiled_resources2.gyp:util',
+      ],
+      'includes': ['../../compile_js2.gypi'],
+    },
 #    {
 #      'target_name': 'gallery',
 #      'includes': ['../../compile_js2.gypi'],
 #    },
+    {
+      'target_name': 'gallery_constants',
+      'includes': ['../../compile_js2.gypi'],
+    },
 #    {
 #      'target_name': 'gallery_data_model',
+#      'dependencies': [
+#        'thumbnail_mode',
+#        '../../file_manager/common/js/compiled_resources2.gyp:util',
+#        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
+#        'gallery_item',
+#        '<(DEPTH)/ui/webui/resources/js/cr/ui/compiled_resources2.gyp:array_data_model',
+#      ],
 #      'includes': ['../../compile_js2.gypi'],
 #    },
-#    {
-#      'target_name': 'gallery_item',
-#      'includes': ['../../compile_js2.gypi'],
-#    },
+    {
+      'target_name': 'gallery_item',
+      'dependencies': [
+        '../../file_manager/common/js/compiled_resources2.gyp:util',
+        '../../file_manager/foreground/js/compiled_resources2.gyp:volume_manager_wrapper',
+        '../../file_manager/foreground/js/metadata/compiled_resources2.gyp:metadata_model',
+        '../../file_manager/foreground/js/metadata/compiled_resources2.gyp:thumbnail_model',
+        'gallery_util',
+        'image_editor/compiled_resources2.gyp:image_encoder',
+        'image_editor/compiled_resources2.gyp:image_util',
+      ],
+      'includes': ['../../compile_js2.gypi'],
+    },
 #    {
 #      'target_name': 'gallery_scripts',
 #      'includes': ['../../compile_js2.gypi'],
 #    },
-#    {
-#      'target_name': 'gallery_util',
-#      'includes': ['../../compile_js2.gypi'],
-#    },
-#    {
-#      'target_name': 'metadata_worker',
-#      'includes': ['../../compile_js2.gypi'],
-#    },
-#    {
-#      'target_name': 'ribbon',
-#      'includes': ['../../compile_js2.gypi'],
-#    },
+    {
+      'target_name': 'gallery_util',
+      'dependencies': [
+        '../../file_manager/common/js/compiled_resources2.gyp:file_type',
+        '../../file_manager/common/js/compiled_resources2.gyp:util',
+        '../../file_manager/common/js/compiled_resources2.gyp:volume_manager_common',
+        '../../file_manager/foreground/js/compiled_resources2.gyp:volume_manager_wrapper',
+      ],
+      'includes': ['../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'metadata_worker',
+      'includes': ['../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'ribbon',
+      'dependencies': [
+        '../../externs/compiled_resources2.gyp:gallery_event',
+        '../../file_manager/foreground/js/compiled_resources2.gyp:thumbnail_loader',
+        '../../file_manager/foreground/js/metadata/compiled_resources2.gyp:thumbnail_model',
+        '<(DEPTH)/ui/webui/resources/js/cr/ui/compiled_resources2.gyp:array_data_model',
+        '<(DEPTH)/ui/webui/resources/js/cr/ui/compiled_resources2.gyp:list_selection_model',
+        'gallery_item',
+        'image_editor/compiled_resources2.gyp:image_util',
+      ],
+      'includes': ['../../compile_js2.gypi'],
+    },
 #    {
 #      'target_name': 'slide_mode',
+#      'dependencies': [
+#        '../../file_manager/common/js/compiled_resources2.gyp:metrics',
+#        '../../file_manager/common/js/compiled_resources2.gyp:util',
+#        '<(EXTERNS_GYP):chrome_extensions',
+#        'gallery_item',
+#        'image_editor/compiled_resources2.gyp:image_editor',
+#        'image_editor/compiled_resources2.gyp:image_util',
+#        'image_editor/compiled_resources2.gyp:image_view',
+#        'image_editor/compiled_resources2.gyp:viewport',
+#      ],
 #      'includes': ['../../compile_js2.gypi'],
 #    },
 #    {
 #      'target_name': 'thumbnail_mode',
+#      'dependencies': [
+#        '../../file_manager/foreground/js/compiled_resources2.gyp:thumbnail_loader',
+#        '../../file_manager/foreground/js/metadata/compiled_resources2.gyp:thumbnail_model',
+#        '<(DEPTH)/ui/webui/resources/js/cr/ui/compiled_resources2.gyp:list_selection_model',
+#        'error_banner',
+#        'gallery_data_model',
+#        'gallery_item',
+#        'image_editor/compiled_resources2.gyp:image_editor',
+#      ],
 #      'includes': ['../../compile_js2.gypi'],
 #    },
   ],
diff --git a/chromium/ui/file_manager/gallery/js/image_editor/compiled_resources2.gyp b/chromium/ui/file_manager/gallery/js/image_editor/compiled_resources2.gyp
index 255bb3dc1c9..477b9dcf0d4 100644
--- a/chromium/ui/file_manager/gallery/js/image_editor/compiled_resources2.gyp
+++ b/chromium/ui/file_manager/gallery/js/image_editor/compiled_resources2.gyp
@@ -1,55 +1,138 @@
 # Copyright 2016 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.
+# TODO(oka): Compile all the targets.
 {
   'targets': [
-#    {
-#      'target_name': 'commands',
-#      'includes': ['../../../compile_js2.gypi'],
-#    },
-#    {
-#      'target_name': 'exif_encoder',
-#      'includes': ['../../../compile_js2.gypi'],
-#    },
-#    {
-#      'target_name': 'filter',
-#      'includes': ['../../../compile_js2.gypi'],
-#    },
+    {
+      'target_name': 'commands',
+      'dependencies': [
+        'filter',
+        'image_editor_prompt',
+        'image_util',
+        'image_view',
+        'viewport',
+        '../../../file_manager/foreground/elements/compiled_resources2.gyp:files_toast',
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'exif_encoder',
+      'dependencies': [
+        '../../../externs/compiled_resources2.gyp:exif_entry',
+        '../../../file_manager/foreground/js/metadata/compiled_resources2.gyp:exif_constants',
+        '../../../file_manager/foreground/js/metadata/compiled_resources2.gyp:metadata_item',
+        'image_encoder',
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'filter',
+      'dependencies': [
+        'image_util',
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
 #    {
 #      'target_name': 'image_adjust',
+#      'dependencies': [
+#        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
+#        'commands',
+#        'image_editor',
+#      ],
 #      'includes': ['../../../compile_js2.gypi'],
 #    },
-#    {
-#      'target_name': 'image_buffer',
-#      'includes': ['../../../compile_js2.gypi'],
-#    },
+    {
+      'target_name': 'image_buffer',
+      'includes': ['../../../compile_js2.gypi'],
+    },
 #    {
 #      'target_name': 'image_editor',
+#      'dependencies': [
+#        'viewport',
+#        'image_view',
+#        'commands',
+#        '../../../file_manager/common/js/compiled_resources2.gyp:util',
+#        'image_buffer',
+#        'image_util',
+#        '<(DEPTH)/ui/webui/resources/js/cr/compiled_resources2.gyp:event_target',
+#        '../../../file_manager/foreground/elements/compiled_resources2.gyp:files_tooltip',
+#        '../../../file_manager/common/js/compiled_resources2.gyp:util',
+#        '../compiled_resources2.gyp:gallery_util',
+#      ],
 #      'includes': ['../../../compile_js2.gypi'],
 #    },
-#    {
-#      'target_name': 'image_encoder',
-#      'includes': ['../../../compile_js2.gypi'],
-#    },
+    {
+      'target_name': 'image_editor_prompt',
+      'dependencies': [
+        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'image_encoder',
+      'dependencies': [
+        '../../../file_manager/foreground/js/metadata/compiled_resources2.gyp:metadata_item',
+        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
+        'image_util',
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'image_loader',
+      'dependencies': [
+        '../../../file_manager/common/js/compiled_resources2.gyp:file_type',
+        '../../../file_manager/common/js/compiled_resources2.gyp:metrics_base',
+        '../../../file_manager/common/js/compiled_resources2.gyp:util',
+        '../../../file_manager/foreground/js/metadata/compiled_resources2.gyp:metadata_model',
+        '../../../image_loader/compiled_resources2.gyp:image_loader_client',
+        '../compiled_resources2.gyp:gallery_item',
+        'image_util',
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
 #    {
 #      'target_name': 'image_transform',
+#      'dependencies': [
+#        'commands',
+#        'viewport',
+#        'image_buffer',
+#        'image_util',
+#      ],
 #      'includes': ['../../../compile_js2.gypi'],
 #    },
-#    {
-#      'target_name': 'image_util',
-#      'includes': ['../../../compile_js2.gypi'],
-#    },
-#    {
-#      'target_name': 'image_view',
-#      'includes': ['../../../compile_js2.gypi'],
-#    },
-#    {
-#      'target_name': 'test_util',
-#      'includes': ['../../../compile_js2.gypi'],
-#    },
-#    {
-#      'target_name': 'viewport',
-#      'includes': ['../../../compile_js2.gypi'],
-#    },
+    {
+      'target_name': 'image_util',
+      'dependencies': [
+        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'image_view',
+      'dependencies': [
+        '../../../file_manager/common/js/compiled_resources2.gyp:metrics',
+        '../../../file_manager/foreground/js/compiled_resources2.gyp:thumbnail_loader',
+        '../compiled_resources2.gyp:gallery_item',
+        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
+        'image_buffer',
+        'image_loader',
+        'image_util',
+        'viewport',
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'test_util',
+      'includes': ['../../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'viewport',
+      'dependencies': [
+        '<(DEPTH)/ui/webui/resources/js/cr/compiled_resources2.gyp:event_target',
+        'image_util',
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
   ],
 }
diff --git a/chromium/ui/file_manager/video_player/js/cast/compiled_resources2.gyp b/chromium/ui/file_manager/video_player/js/cast/compiled_resources2.gyp
index 3ea52f4e94f..672f2c24629 100644
--- a/chromium/ui/file_manager/video_player/js/cast/compiled_resources2.gyp
+++ b/chromium/ui/file_manager/video_player/js/cast/compiled_resources2.gyp
@@ -3,21 +3,40 @@
 # found in the LICENSE file.
 {
   'targets': [
-#    {
-#      'target_name': 'cast_extension_discoverer',
-#      'includes': ['../../../compile_js2.gypi'],
-#    },
-#    {
-#      'target_name': 'cast_video_element',
-#      'includes': ['../../../compile_js2.gypi'],
-#    },
-#    {
-#      'target_name': 'caster',
-#      'includes': ['../../../compile_js2.gypi'],
-#    },
-#    {
-#      'target_name': 'media_manager',
-#      'includes': ['../../../compile_js2.gypi'],
-#    },
+    {
+      'target_name': 'cast_extension_discoverer',
+      'dependencies': [
+        '../compiled_resources2.gyp:error_util',
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'cast_video_element',
+      'dependencies': [
+        '../../../externs/compiled_resources2.gyp:chrome_cast',
+        '../../../externs/compiled_resources2.gyp:platform',
+        '../compiled_resources2.gyp:error_util',
+        '../compiled_resources2.gyp:video_player_metrics',
+        '<(DEPTH)/ui/webui/resources/js/cr/compiled_resources2.gyp:event_target',
+        'media_manager',
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'caster',
+      'dependencies': [
+        '../../../externs/compiled_resources2.gyp:chrome_cast',
+        '../compiled_resources2.gyp:video_player',
+        'cast_extension_discoverer',
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'media_manager',
+      'dependencies': [
+        '<(EXTERNS_GYP):file_manager_private',
+      ],
+      'includes': ['../../../compile_js2.gypi'],
+    },
   ],
 }
diff --git a/chromium/ui/file_manager/video_player/js/compiled_resources.gyp b/chromium/ui/file_manager/video_player/js/compiled_resources.gyp
deleted file mode 100644
index 41d4ea211e2..00000000000
--- a/chromium/ui/file_manager/video_player/js/compiled_resources.gyp
+++ /dev/null
@@ -1,136 +0,0 @@
-# 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',
-          '../../../webui/resources/js/promise_resolver.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/metrics_base.js',
-          '../../file_manager/common/js/metrics_events.js',
-          '../../file_manager/common/js/metrics.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/entry_location_impl.js',
-          '../../file_manager/background/js/volume_info_impl.js',
-          '../../file_manager/background/js/volume_info_list_impl.js',
-          '../../file_manager/background/js/volume_manager_factory.js',
-          '../../file_manager/background/js/volume_manager_impl.js',
-          '../../file_manager/background/js/volume_manager_util.js',
-          '../../file_manager/background/js/test_util_base.js',
-          'error_util.js',
-          'test_util.js',
-        ],
-        'externs': [
-          '<(EXTERNS_DIR)/chrome_extensions.js',
-          '<(EXTERNS_DIR)/chrome_send.js',
-          '<(EXTERNS_DIR)/file_manager_private.js',
-          '<(EXTERNS_DIR)/metrics_private.js',
-          '../../../../third_party/analytics/externs.js',
-          '../../externs/chrome_test.js',
-          '../../externs/entry_location.js',
-          '../../externs/es6_workaround.js',
-          '../../externs/platform.js',
-          '../../externs/volume_info.js',
-          '../../externs/volume_info_list.js',
-          '../../externs/volume_manager.js',
-        ],
-      },
-      'includes': [
-        '../../compile_js.gypi',
-      ],
-    },
-    {
-      'target_name': 'video_player',
-      'variables': {
-        'depends': [
-          '../../../../third_party/jstemplate/compiled_resources.gyp:jstemplate',
-          '../../../../third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior/iron-a11y-keys-behavior-extracted.js',
-          '../../../../third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-button-state-extracted.js',
-          '../../../../third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-control-state-extracted.js',
-          '../../../../third_party/polymer/v1_0/components-chromium/iron-form-element-behavior/iron-form-element-behavior-extracted.js',
-          '../../../../third_party/polymer/v1_0/components-chromium/iron-range-behavior/iron-range-behavior-extracted.js',
-          '../../../../third_party/polymer/v1_0/components-chromium/paper-behaviors/paper-inky-focus-behavior-extracted.js',
-          '../../../../third_party/polymer/v1_0/components-chromium/paper-behaviors/paper-ripple-behavior-extracted.js',
-          '../../../../third_party/polymer/v1_0/components-chromium/paper-progress/paper-progress-extracted.js',
-          '../../../../third_party/polymer/v1_0/components-chromium/paper-ripple/paper-ripple-extracted.js',
-          '../../../../third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider-extracted.js',
-          '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/promise_resolver.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/compiled_resources.gyp:i18n_template_no_process',
-          '../../file_manager/common/js/async_util.js',
-          '../../file_manager/common/js/file_type.js',
-          '../../file_manager/common/js/lru_cache.js',
-          '../../file_manager/common/js/metrics_base.js',
-          '../../file_manager/common/js/metrics_events.js',
-          '../../file_manager/common/js/metrics.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.
-          '../../image_loader/image_loader_client.js',
-          'cast/cast_extension_discoverer.js',
-          'cast/cast_video_element.js',
-          'cast/media_manager.js',
-          'cast/caster.js',
-          'media_controls.js',
-        ],
-        'externs': [
-          '<(EXTERNS_DIR)/chrome_extensions.js',
-          '<(EXTERNS_DIR)/chrome_send.js',
-          '<(EXTERNS_DIR)/file_manager_private.js',
-          '<(EXTERNS_DIR)/media_player_private.js',
-          '<(EXTERNS_DIR)/metrics_private.js',
-          '../../../../third_party/analytics/externs.js',
-          '../../externs/app_window_common.js',
-          '../../externs/background_window_common.js',
-          '../../externs/chrome_test.js',
-          '../../externs/chrome_cast.js',
-          '../../externs/chrome_webstore_widget_private.js',
-          '../../externs/entry_location.js',
-          '../../externs/es6_workaround.js',
-          '../../externs/platform.js',
-          '../../externs/volume_info.js',
-          '../../externs/volume_info_list.js',
-          '../../externs/volume_manager.js',
-        ],
-      },
-      'includes': [
-        '../../compile_js.gypi',
-      ],
-    }
-  ],
-}
-
diff --git a/chromium/ui/file_manager/video_player/js/compiled_resources2.gyp b/chromium/ui/file_manager/video_player/js/compiled_resources2.gyp
index e665539aff4..1828bfac1bf 100644
--- a/chromium/ui/file_manager/video_player/js/compiled_resources2.gyp
+++ b/chromium/ui/file_manager/video_player/js/compiled_resources2.gyp
@@ -3,22 +3,49 @@
 # found in the LICENSE file.
 {
   'targets': [
-#    {
-#      'target_name': 'background',
-#      'includes': ['../../compile_js2.gypi'],
-#    },
-#    {
-#      'target_name': 'error_util',
-#      'includes': ['../../compile_js2.gypi'],
-#    },
-#    {
-#      'target_name': 'media_controls',
-#      'includes': ['../../compile_js2.gypi'],
-#    },
-#    {
-#      'target_name': 'video_player',
-#      'includes': ['../../compile_js2.gypi'],
-#    },
+    {
+      'target_name': 'background',
+      'dependencies': [
+        '../../file_manager/background/js/compiled_resources2.gyp:app_window_wrapper',
+        '../../file_manager/background/js/compiled_resources2.gyp:background_base',
+        'error_util',
+      ],
+      'includes': ['../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'error_util',
+      'includes': ['../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'media_controls',
+      'dependencies': [
+        '../../file_manager/common/js/compiled_resources2.gyp:util',
+        '<(DEPTH)/third_party/polymer/v1_0/components-chromium/paper-slider/compiled_resources2.gyp:paper-slider-extracted',
+        '<(DEPTH)/ui/webui/resources/js/cr/ui/compiled_resources2.gyp:menu_button',
+        '<(EXTERNS_GYP):media_player_private',
+      ],
+      'includes': ['../../compile_js2.gypi'],
+    },
+    {
+      'target_name': 'video_player',
+      'dependencies': [
+        '../../externs/compiled_resources2.gyp:chrome_cast',
+        '../../file_manager/common/js/compiled_resources2.gyp:metrics',
+        '../../file_manager/common/js/compiled_resources2.gyp:util',
+        '../../file_manager/foreground/js/compiled_resources2.gyp:mouse_inactivity_watcher',
+        '../../file_manager/foreground/js/compiled_resources2.gyp:volume_manager_wrapper',
+        '../../image_loader/compiled_resources2.gyp:image_loader_client',
+        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_template_no_process',
+        '<(DEPTH)/ui/webui/resources/js/cr/ui/compiled_resources2.gyp:menu',
+        '<(DEPTH)/ui/webui/resources/js/cr/ui/compiled_resources2.gyp:menu_item',
+        'cast/compiled_resources2.gyp:cast_video_element',
+        'cast/compiled_resources2.gyp:media_manager',
+        'error_util',
+        'media_controls',
+        'video_player_metrics',
+      ],
+      'includes': ['../../compile_js2.gypi'],
+    },
     {
       'target_name': 'video_player_metrics',
       'dependencies': [
@@ -26,9 +53,5 @@
       ],
       'includes': ['../../compile_js2.gypi'],
     },
-#    {
-#      'target_name': 'video_player_scripts',
-#      'includes': ['../../compile_js2.gypi'],
-#    },
   ],
 }