Skip to content

GitLab

T
tangled
Commit acdf1c15 authored by yosihki's avatar yosihki
Browse files
Options

Files.app: Move VP/Galllery related files to dedicate folders 

- Move file_manager/js/media/media_controls.{css,js}
   -> video_player/js
- Move file_manager/js/media/mouse_inactivity_watcher.js
   -> file_manager/js (parent directory)
- Move file_manager/images/media/*
   -> video_player/images/media/
- Move file_manager/images/media/error.png
   -> gallery/images/media/error.png

BUG=405838
TEST=compile pasees
R=hirono@chromium.org

Review URL: https://codereview.chromium.org/504073002

Cr-Commit-Position: refs/heads/master@{#292609}
parent 3a31d8e4
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
ui/file_manager/gallery/css/gallery.css
View file @ acdf1c15
...@@ -1128,8 +1128,8 @@ input[type='checkbox']:checked { ...@@ -1128,8 +1128,8 @@ input[type='checkbox']:checked {
-webkit-box-pack: center; -webkit-box-pack: center;
background-color: rgba(24, 24, 24, 1); background-color: rgba(24, 24, 24, 1);
background-image: -webkit-image-set( background-image: -webkit-image-set(
url(../../file_manager/foreground/images/media/error.png) 1x, url(../images/100/error.png) 1x,
url(../../file_manager/foreground/images/media/2x/error.png) 2x); url(../images/200/error.png) 2x);
background-position: 25px center; background-position: 25px center;
background-repeat: no-repeat; background-repeat: no-repeat;
color: white; color: white;
......
ui/file_manager/gallery/gallery.html
View file @ acdf1c15
...@@ -60,8 +60,8 @@ ...@@ -60,8 +60,8 @@
<script src="js/image_editor/image_encoder.js"></script> <script src="js/image_editor/image_encoder.js"></script>
<script src="js/image_editor/exif_encoder.js"></script> <script src="js/image_editor/exif_encoder.js"></script>
<script src="../file_manager/foreground/js/media/mouse_inactivity_watcher.js"></script>
<script src="../file_manager/foreground/js/metadata/metadata_cache.js"></script> <script src="../file_manager/foreground/js/metadata/metadata_cache.js"></script>
<script src="../file_manager/foreground/js/mouse_inactivity_watcher.js"></script>
<script src="../file_manager/foreground/js/share_client.js"></script> <script src="../file_manager/foreground/js/share_client.js"></script>
<script src="../file_manager/foreground/js/share_dialog.js"></script> <script src="../file_manager/foreground/js/share_dialog.js"></script>
......
ui/file_manager/gallery/js/gallery_scripts.js
View file @ acdf1c15
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
//<include src="image_editor/image_encoder.js"/> //<include src="image_editor/image_encoder.js"/>
//<include src="image_editor/exif_encoder.js"/> //<include src="image_editor/exif_encoder.js"/>
//<include src="../../file_manager/foreground/js/media/mouse_inactivity_watcher.js"/>
//<include src="../../file_manager/foreground/js/metadata/metadata_cache.js"/> //<include src="../../file_manager/foreground/js/metadata/metadata_cache.js"/>
//<include src="../../file_manager/foreground/js/mouse_inactivity_watcher.js"/>
//<include src="../../file_manager/foreground/js/ui/file_manager_dialog_base.js"> //<include src="../../file_manager/foreground/js/ui/file_manager_dialog_base.js">
//<include src="../../file_manager/foreground/js/share_client.js"> //<include src="../../file_manager/foreground/js/share_client.js">
......
ui/file_manager/video_player/js/video_player_scripts.js
View file @ acdf1c15
...@@ -29,14 +29,15 @@ ...@@ -29,14 +29,15 @@
//<include src="../../file_manager/common/js/async_util.js"/> //<include src="../../file_manager/common/js/async_util.js"/>
//<include src="../../file_manager/common/js/util.js"/> //<include src="../../file_manager/common/js/util.js"/>
//<include src="../../file_manager/foreground/js/media/media_controls.js"/> //<include src="../../file_manager/foreground/js/mouse_inactivity_watcher.js"/>
//<include src="../../file_manager/foreground/js/media/mouse_inactivity_watcher.js"/>
//<include src="cast/cast_extension_discoverer.js"/> //<include src="cast/cast_extension_discoverer.js"/>
//<include src="cast/cast_video_element.js"/> //<include src="cast/cast_video_element.js"/>
//<include src="cast/media_manager.js"/> //<include src="cast/media_manager.js"/>
//<include src="cast/caster.js"/> //<include src="cast/caster.js"/>
//<include src="media_controls.js"/>
//<include src="video_player.js"/> //<include src="video_player.js"/>
window.unload = unload; window.unload = unload;
......
ui/file_manager/video_player/video_player.html
View file @ acdf1c15
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
<head> <head>
<title>#xFEFF;</title> <title>#xFEFF;</title>
<link rel="icon" type="image/png" href="images/icon/video-player-favicon32.png"> <link rel="icon" type="image/png" href="images/icon/video-player-favicon32.png">
<link rel="stylesheet" type="text/css" <link rel="stylesheet" type="text/css" href="css/media_controls.css">
href="../file_manager/foreground/css/media_controls.css">
<link rel="stylesheet" href="chrome://resources/css/menu.css"></link> <link rel="stylesheet" href="chrome://resources/css/menu.css"></link>
<link rel="stylesheet" type="text/css" href="css/video_player.css"> <link rel="stylesheet" type="text/css" href="css/video_player.css">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment