[File Manager] Cleanup: Moving js/css/html files to dedicated directories

This is pure refactoring patch, no new functionality is introduced.
This retires gallery_demo.html which is superceded by harness.html.

BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/9583009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124926 0039d316-1c4b-4281-b951-d872f2087c98

24 files changed, 120 insertions, 454 deletions

diff --git a/chrome/browser/resources/component_extension_resources.grd b/chrome/browser/resources/component_extension_resources.grd
index 656f8b8..6f8bbdb 100644
--- a/chrome/browser/resources/component_extension_resources.grd
+++ b/chrome/browser/resources/component_extension_resources.grd
@@ -27,19 +27,17 @@
       <if expr="pp_ifdef('file_manager_extension')">
         <include name="IDR_FILE_MANAGER_MAIN" file="file_manager/main.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_FILE_MANAGER_MEDIAPLAYER" file="file_manager/mediaplayer.html" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_FILE_MANAGER_PLAYLIST" file="file_manager/playlist.html" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_FILE_MANAGER_IMAGE_EDITOR" file="file_manager/js/image_editor/gallery.html" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_FILE_MANAGER_METADATA_DISPATCHER" file="file_manager/js/metadata_dispatcher.js" type="BINDATA" />
-        <include name="IDR_FILE_MANAGER_FILE_COPY_MANAGER" file="file_manager/js/file_copy_manager.js" type="BINDATA" />
-        <include name="IDR_FILE_MANAGER_METADATA_READER" file="file_manager/js/byte_reader.js" type="BINDATA" />
-        <include name="IDR_FILE_MANAGER_METADATA_PARSER" file="file_manager/js/metadata_parser.js" type="BINDATA" />
         <include name="IDR_FILE_MANAGER_UTIL" file="file_manager/js/util.js" type="BINDATA" />
-        <include name="IDR_FILE_MANAGER_EXIF_PARSER" file="file_manager/js/exif_parser.js" type="BINDATA" />
-        <include name="IDR_FILE_MANAGER_MPEG_PARSER" file="file_manager/js/mpeg_parser.js" type="BINDATA" />
-        <include name="IDR_FILE_MANAGER_IMAGE_PARSERS" file="file_manager/js/image_parsers.js" type="BINDATA" />
-        <include name="IDR_FILE_MANAGER_ID3_PARSER" file="file_manager/js/id3_parser.js" type="BINDATA" />
-        <include name="IDR_FILE_MANAGER_PARALLEL" file="file_manager/js/function_parallel.js" type="BINDATA" />
-        <include name="IDR_FILE_MANAGER_SEQUENCE" file="file_manager/js/function_sequence.js" type="BINDATA" />
+        <include name="IDR_FILE_MANAGER_IMAGE_EDITOR" file="file_manager/gallery.html" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_FILE_MANAGER_METADATA_DISPATCHER" file="file_manager/js/metadata/metadata_dispatcher.js" type="BINDATA" />
+        <include name="IDR_FILE_MANAGER_METADATA_READER" file="file_manager/js/metadata/byte_reader.js" type="BINDATA" />
+        <include name="IDR_FILE_MANAGER_METADATA_PARSER" file="file_manager/js/metadata/metadata_parser.js" type="BINDATA" />
+        <include name="IDR_FILE_MANAGER_EXIF_PARSER" file="file_manager/js/metadata/exif_parser.js" type="BINDATA" />
+        <include name="IDR_FILE_MANAGER_MPEG_PARSER" file="file_manager/js/metadata/mpeg_parser.js" type="BINDATA" />
+        <include name="IDR_FILE_MANAGER_IMAGE_PARSERS" file="file_manager/js/metadata/image_parsers.js" type="BINDATA" />
+        <include name="IDR_FILE_MANAGER_ID3_PARSER" file="file_manager/js/metadata/id3_parser.js" type="BINDATA" />
+        <include name="IDR_FILE_MANAGER_PARALLEL" file="file_manager/js/metadata/function_parallel.js" type="BINDATA" />
+        <include name="IDR_FILE_MANAGER_SEQUENCE" file="file_manager/js/metadata/function_sequence.js" type="BINDATA" />
         <include name="IDR_FILE_MANAGER_ICON_16" file="file_manager/images/icon16.png" type="BINDATA" />
         <include name="IDR_FILE_MANAGER_ICON_128" file="file_manager/images/icon128.png" type="BINDATA" />
         <include name="IDR_FILE_MANAGER_PREVIEW_ICON" file="file_manager/images/icon_preview_16x16.png" type="BINDATA" />
diff --git a/chrome/browser/resources/file_manager/js/image_editor/gallery.css b/chrome/browser/resources/file_manager/css/gallery.css
index 8fc8d3d..0e4c516 100644
--- a/chrome/browser/resources/file_manager/js/image_editor/gallery.css
+++ b/chrome/browser/resources/file_manager/css/gallery.css
@@ -37,7 +37,7 @@ body {
   opacity: 0;
   width: 20px;
   height: 20px;
-  background-image: url(../../images/gallery/close_x.png);
+  background-image: url(../images/gallery/close_x.png);
   background-repeat: no-repeat;
   background-position: center center;
 }
@@ -71,31 +71,31 @@ body {
 }
 
 .gallery[tools] .image-container[cursor='move'] {
-  cursor: url(../../images/gallery/cursor_move.png) 18 18;
+  cursor: url(../images/gallery/cursor_move.png) 18 18;
 }
 
 .gallery[tools] .image-container[cursor='crop'] {
-  cursor: url(../../images/gallery/cursor_crop.png) 18 18;
+  cursor: url(../images/gallery/cursor_crop.png) 18 18;
 }
 
 .gallery[tools] .image-container[cursor='n-resize'],
 .gallery[tools] .image-container[cursor='s-resize'] {
-  cursor: url(../../images/gallery/cursor_updown.png) 18 18;
+  cursor: url(../images/gallery/cursor_updown.png) 18 18;
 }
 
 .gallery[tools] .image-container[cursor='e-resize'],
 .gallery[tools] .image-container[cursor='w-resize'] {
-  cursor: url(../../images/gallery/cursor_leftright.png) 18 18;
+  cursor: url(../images/gallery/cursor_leftright.png) 18 18;
 }
 
 .gallery[tools] .image-container[cursor='nw-resize'],
 .gallery[tools] .image-container[cursor='se-resize'] {
-  cursor: url(../../images/gallery/cursor_nwse.png) 18 18;
+  cursor: url(../images/gallery/cursor_nwse.png) 18 18;
 }
 
 .gallery[tools] .image-container[cursor='ne-resize'],
 .gallery[tools] .image-container[cursor='sw-resize'] {
-  cursor: url(../../images/gallery/cursor_swne.png) 18 18;
+  cursor: url(../images/gallery/cursor_swne.png) 18 18;
 }
 
 .gallery > .image-container > .image {
@@ -200,11 +200,11 @@ body {
 }
 
 .gallery .arrow.left div{
-  background-image: url(../../images/gallery/arrow_left.png);
+  background-image: url(../images/gallery/arrow_left.png);
 }
 
 .gallery .arrow.right div{
-  background-image: url(../../images/gallery/arrow_right.png);
+  background-image: url(../images/gallery/arrow_right.png);
 }
 
 /* Special behavior on mouse drag.
@@ -424,52 +424,52 @@ body {
 }
 
 .gallery > .toolbar .button.autofix {
-  background-image: url(../../images/gallery/icon_autofix.png);
+  background-image: url(../images/gallery/icon_autofix.png);
 }
 
 .gallery > .toolbar .button.autofix[pressed] {
-  background-image: url(../../images/gallery/icon_autofix_selected.png);
+  background-image: url(../images/gallery/icon_autofix_selected.png);
 }
 
 .gallery > .toolbar .button.crop {
-  background-image: url(../../images/gallery/icon_crop.png);
+  background-image: url(../images/gallery/icon_crop.png);
 }
 
 .gallery > .toolbar .button.crop[pressed] {
-  background-image: url(../../images/gallery/icon_crop_selected.png);
+  background-image: url(../images/gallery/icon_crop_selected.png);
 }
 
 .gallery > .toolbar .button.exposure {
-  background-image: url(../../images/gallery/icon_brightness.png);
+  background-image: url(../images/gallery/icon_brightness.png);
 }
 
 .gallery > .toolbar .button.exposure[pressed] {
-  background-image: url(../../images/gallery/icon_brightness_selected.png);
+  background-image: url(../images/gallery/icon_brightness_selected.png);
 }
 
 .gallery > .toolbar .button.rotate_right {
-  background-image: url(../../images/gallery/icon_rotate.png);
+  background-image: url(../images/gallery/icon_rotate.png);
 }
 
 .gallery > .toolbar .button.rotate_right[pressed] {
-  background-image: url(../../images/gallery/icon_rotate_selected.png);
+  background-image: url(../images/gallery/icon_rotate_selected.png);
 }
 
 .gallery > .toolbar .button.rotate_left {
-  background-image: url(../../images/gallery/icon_rotate_left.png);
+  background-image: url(../images/gallery/icon_rotate_left.png);
 }
 
 .gallery > .toolbar .button.rotate_left[pressed] {
-  background-image: url(../../images/gallery/icon_rotate_left_selected.png);
+  background-image: url(../images/gallery/icon_rotate_left_selected.png);
 }
 
 .gallery > .toolbar .button.undo {
-  background-image: url(../../images/gallery/icon_undo.png);
+  background-image: url(../images/gallery/icon_undo.png);
 }
 
 .gallery > .toolbar .button.redo {
   position: absolute; /* Exclude from center-packing*/
-  background-image: url(../../images/gallery/icon_redo.png);
+  background-image: url(../images/gallery/icon_redo.png);
 }
 
 .gallery > .toolbar .button[disabled] {
@@ -484,21 +484,21 @@ body {
 .gallery > .toolbar > .button.edit {
   position: relative;
   z-index: 10;
-  background-image: url(../../images/gallery/icon_edit.png);
+  background-image: url(../images/gallery/icon_edit.png);
 }
 
 .gallery > .toolbar > .button.edit[pressed] {
-  background-image: url(../../images/gallery/icon_edit_selected.png);
+  background-image: url(../images/gallery/icon_edit_selected.png);
 }
 
 .gallery > .toolbar > .button.share {
   position: relative;
   z-index: 10;
-  background-image: url(../../images/gallery/icon_share.png);
+  background-image: url(../images/gallery/icon_share.png);
 }
 
 .gallery > .toolbar > .button.share[pressed] {
-  background-image: url(../../images/gallery/icon_share_selected.png);
+  background-image: url(../images/gallery/icon_share_selected.png);
 }
 
 .gallery > .toolbar > .button:last-child {
@@ -547,12 +547,12 @@ body {
 }
 
 .gallery .edit-modal .label.brightness {
-  background-image: url(../../images/gallery/icon_brightness.png);
+  background-image: url(../images/gallery/icon_brightness.png);
 }
 
 .gallery .edit-modal .label.contrast {
   margin-left: 15px;
-  background-image: url(../../images/gallery/icon_contrast.png);
+  background-image: url(../images/gallery/icon_contrast.png);
 }
 
 .gallery .edit-modal .range {
@@ -566,7 +566,7 @@ body {
   -webkit-appearance: none;
   width: 16px;
   height: 29px;
-  background-image: url(../../images/gallery/slider_thumb.png);
+  background-image: url(../images/gallery/slider_thumb.png);
 }
 
 /* Crop frame */
@@ -714,7 +714,7 @@ body {
 }
 
 .gallery .share-menu .bubble-point {
-  background-image: url(../../images/gallery/bubble_point.png);
+  background-image: url(../images/gallery/bubble_point.png);
   background-position: center top;
   background-repeat: no-repeat;
   position: absolute;
diff --git a/chrome/browser/resources/file_manager/js/image_editor/media_controls.css b/chrome/browser/resources/file_manager/css/media_controls.css
index e1a281a..ca0b5e3 100644
--- a/chrome/browser/resources/file_manager/js/image_editor/media_controls.css
+++ b/chrome/browser/resources/file_manager/css/media_controls.css
@@ -192,31 +192,31 @@
 }
 
 .media-button.play > .state0.normal {
-  background-image: url(../../images/media/media_play.png);
+  background-image: url(../images/media/media_play.png);
 }
 
 .media-button.play > .state0.hover {
-  background-image: url(../../images/media/media_play_hover.png);
+  background-image: url(../images/media/media_play_hover.png);
 }
 
 .media-button.play > .state0.active {
-  background-image: url(../../images/media/media_play_down.png);
+  background-image: url(../images/media/media_play_down.png);
 }
 
 .media-button.play > .state1.normal{
-  background-image: url(../../images/media/media_pause.png);
+  background-image: url(../images/media/media_pause.png);
 }
 
 .media-button.play > .state1.hover {
-  background-image: url(../../images/media/media_pause_hover.png);
+  background-image: url(../images/media/media_pause_hover.png);
 }
 
 .media-button.play > .state1.active {
-  background-image: url(../../images/media/media_pause_down.png);
+  background-image: url(../images/media/media_pause_down.png);
 }
 
 .media-button.play > .disabled {
-  background-image: url(../../images/media/media_play_disabled.png);
+  background-image: url(../images/media/media_play_disabled.png);
 }
 
 /* Time controls: a slider and a text time display. */
@@ -241,15 +241,15 @@
 
 .custom-slider.progress > input[type='range']::-webkit-slider-thumb {
   width: 28px;
-  background-image: url(../../images/media/media_slider_thumb.png);
+  background-image: url(../images/media/media_slider_thumb.png);
 }
 
 .custom-slider.progress > input[type='range']::-webkit-slider-thumb:hover {
-  background-image: url(../../images/media/media_slider_thumb_hover.png);
+  background-image: url(../images/media/media_slider_thumb_hover.png);
 }
 
 .custom-slider.progress > input[type='range']::-webkit-slider-thumb:active {
-  background-image: url(../../images/media/media_slider_thumb_down.png);
+  background-image: url(../images/media/media_slider_thumb_down.png);
 }
 
 .custom-slider.progress.disabled > input[type='range']::-webkit-slider-thumb {
@@ -309,59 +309,59 @@
 }
 
 .media-button.sound[level='0'] > .normal {
-  background-image: url(../../images/media/media_sound_disabled.png);
+  background-image: url(../images/media/media_sound_disabled.png);
 }
 
 .media-button.sound[level='0'] > .hover {
-  background-image: url(../../images/media/media_sound_disabled_hover.png);
+  background-image: url(../images/media/media_sound_disabled_hover.png);
 }
 
 .media-button.sound[level='0'] > .active {
-  background-image: url(../../images/media/media_sound_disabled_down.png);
+  background-image: url(../images/media/media_sound_disabled_down.png);
 }
 
 
 .media-button.sound[level='1'] > .normal {
-  background-image: url(../../images/media/media_sound_level1.png);
+  background-image: url(../images/media/media_sound_level1.png);
 }
 
 .media-button.sound[level='1'] > .hover {
-  background-image: url(../../images/media/media_sound_level1_hover.png);
+  background-image: url(../images/media/media_sound_level1_hover.png);
 }
 
 .media-button.sound[level='1'] > .active {
-  background-image: url(../../images/media/media_sound_level1_down.png);
+  background-image: url(../images/media/media_sound_level1_down.png);
 }
 
 
 .media-button.sound[level='2'] > .normal {
-  background-image: url(../../images/media/media_sound_level2.png);
+  background-image: url(../images/media/media_sound_level2.png);
 }
 
 .media-button.sound[level='2'] > .hover {
-  background-image: url(../../images/media/media_sound_level2_hover.png);
+  background-image: url(../images/media/media_sound_level2_hover.png);
 }
 
 .media-button.sound[level='2'] > .active {
-  background-image: url(../../images/media/media_sound_level2_down.png);
+  background-image: url(../images/media/media_sound_level2_down.png);
 }
 
 
 .media-button.sound[level='3'] > .normal {
-  background-image: url(../../images/media/media_sound_full.png);
+  background-image: url(../images/media/media_sound_full.png);
 }
 
 .media-button.sound[level='3'] > .hover {
-  background-image: url(../../images/media/media_sound_full_hover.png);
+  background-image: url(../images/media/media_sound_full_hover.png);
 }
 
 .media-button.sound[level='3'] > .active {
-  background-image: url(../../images/media/media_sound_full_down.png);
+  background-image: url(../images/media/media_sound_full_down.png);
 }
 
 
 .media-button.sound > .disabled {
-  background-image: url(../../images/media/media_sound_full_disabled.png);
+  background-image: url(../images/media/media_sound_full_disabled.png);
 }
 
 /* Volume slider. */
@@ -376,15 +376,15 @@
 
 .custom-slider.volume > input[type='range']::-webkit-slider-thumb {
   width: 20px;
-  background-image: url(../../images/media/media_volume_slider_thumb.png);
+  background-image: url(../images/media/media_volume_slider_thumb.png);
 }
 
 .custom-slider.volume > input[type='range']::-webkit-slider-thumb:hover {
-  background-image: url(../../images/media/media_volume_slider_thumb_hover.png);
+  background-image: url(../images/media/media_volume_slider_thumb_hover.png);
 }
 
 .custom-slider.volume > input[type='range']::-webkit-slider-thumb:active {
-  background-image: url(../../images/media/media_volume_slider_thumb_down.png);
+  background-image: url(../images/media/media_volume_slider_thumb_down.png);
 }
 
 .custom-slider.volume.disabled > input[type='range']::-webkit-slider-thumb {
@@ -432,19 +432,19 @@
 }
 
 .media-button.fullscreen > .normal {
-  background-image: url(../../images/media/media_fullscreen.png);
+  background-image: url(../images/media/media_fullscreen.png);
 }
 
 .media-button.fullscreen > .hover {
-  background-image: url(../../images/media/media_fullscreen_hover.png);
+  background-image: url(../images/media/media_fullscreen_hover.png);
 }
 
 .media-button.fullscreen > .active {
-  background-image: url(../../images/media/media_fullscreen_down.png);
+  background-image: url(../images/media/media_fullscreen_down.png);
 }
 
 .media-button.fullscreen > .disabled {
-  background-image: url(../../images/media/media_fullscreen_disabled.png);
+  background-image: url(../images/media/media_fullscreen_disabled.png);
 }
 
 .playback-state-icon {
@@ -483,9 +483,9 @@
 }
 
 .playback-state-icon[state='play'] {
-  background-image: url(../../images/media/media_play.png);
+  background-image: url(../images/media/media_play.png);
 }
 
 .playback-state-icon[state='pause'] {
-  background-image: url(../../images/media/media_pause.png);
+  background-image: url(../images/media/media_pause.png);
 }
diff --git a/chrome/browser/resources/file_manager/gallery.html b/chrome/browser/resources/file_manager/gallery.html
new file mode 100644
index 0000000..35d088cd
--- /dev/null
+++ b/chrome/browser/resources/file_manager/gallery.html
@@ -0,0 +1,37 @@
+<!--
+  -- Copyright (c) 2011 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.
+  -->
+
+<!--
+  Load this page into a tab or an iframe, then set the gallery up like this:
+
+    iframe.contentWindow.Gallery.open(parentDirEntry, entries, closeCallback);
+  -->
+<html>
+<head>
+  <link rel="stylesheet" type="text/css" href="css/gallery.css"/>
+  <link rel="stylesheet" type="text/css" href="css/media_controls.css"/>
+
+  <script type="text/javascript" src="js/image_editor/image_util.js"></script>
+  <script type="text/javascript" src="js/image_editor/viewport.js"></script>
+  <script type="text/javascript" src="js/image_editor/image_buffer.js"></script>
+  <script type="text/javascript" src="js/image_editor/image_view.js"></script>
+  <script type="text/javascript" src="js/image_editor/commands.js"></script>
+  <script type="text/javascript" src="js/image_editor/image_editor.js"></script>
+  <script type="text/javascript" src="js/image_editor/image_transform.js"></script>
+  <script type="text/javascript" src="js/image_editor/image_adjust.js"></script>
+  <script type="text/javascript" src="js/image_editor/filter.js"></script>
+  <script type="text/javascript" src="js/image_editor/gallery.js"></script>
+
+  <script type="text/javascript" src="js/image_editor/image_encoder.js"></script>
+  <script type="text/javascript" src="js/image_editor/exif_encoder.js"></script>
+
+  <script type="text/javascript" src="js/media/media_controls.js"></script>
+
+</head>
+<body>
+  <div class="gallery"></div>
+</body>
+</html>
diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js
index 37a5ea1..001348f 100644
--- a/chrome/browser/resources/file_manager/js/file_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_manager.js
@@ -2533,7 +2533,7 @@ FileManager.prototype = {
           str);
     };
 
-    galleryFrame.src = 'js/image_editor/gallery.html';
+    galleryFrame.src = 'gallery.html';
     this.openFilePopup_(galleryFrame);
   };
 
diff --git a/chrome/browser/resources/file_manager/js/image_editor/gallery.html b/chrome/browser/resources/file_manager/js/image_editor/gallery.html
deleted file mode 100644
index 892e220..0000000
--- a/chrome/browser/resources/file_manager/js/image_editor/gallery.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-  -- Copyright (c) 2011 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.
-  -->
-
-<!--
-  Load this page into a tab or an iframe, then set the gallery up like this:
-
-    iframe.contentWindow.Gallery.open(parentDirEntry, entries, closeCallback);
-  -->
-<html>
-<head>
-  <link rel="stylesheet" type="text/css" href="image_editor.css"/>
-  <link rel="stylesheet" type="text/css" href="gallery.css"/>
-  <link rel="stylesheet" type="text/css" href="media_controls.css"/>
-
-  <script type="text/javascript" src="image_util.js"></script>
-  <script type="text/javascript" src="viewport.js"></script>
-  <script type="text/javascript" src="image_buffer.js"></script>
-  <script type="text/javascript" src="image_view.js"></script>
-  <script type="text/javascript" src="commands.js"></script>
-  <script type="text/javascript" src="image_editor.js"></script>
-  <script type="text/javascript" src="image_transform.js"></script>
-  <script type="text/javascript" src="image_adjust.js"></script>
-  <script type="text/javascript" src="filter.js"></script>
-  <script type="text/javascript" src="gallery.js"></script>
-
-  <script type="text/javascript" src="image_encoder.js"></script>
-  <script type="text/javascript" src="exif_encoder.js"></script>
-
-  <script type="text/javascript" src="media_controls.js"></script>
-
-</head>
-<body>
-  <div class="gallery"></div>
-</body>
-</html>
diff --git a/chrome/browser/resources/file_manager/js/image_editor/gallery.js b/chrome/browser/resources/file_manager/js/image_editor/gallery.js
index 5d422c3..4ee6d0a 100644
--- a/chrome/browser/resources/file_manager/js/image_editor/gallery.js
+++ b/chrome/browser/resources/file_manager/js/image_editor/gallery.js
@@ -1184,7 +1184,7 @@ Ribbon.Item.prototype.setMetadata = function(metadata) {
     url = this.url_;
     transform = metadata.imageTransform;
   } else {
-    url = '../../' + FileType.getPreviewArt(mediaType);
+    url = FileType.getPreviewArt(mediaType);
   }
 
   function percent(ratio) { return Math.round(ratio * 100) + '%' }
diff --git a/chrome/browser/resources/file_manager/js/image_editor/gallery_demo.html b/chrome/browser/resources/file_manager/js/image_editor/gallery_demo.html
deleted file mode 100644
index a71818b..0000000
--- a/chrome/browser/resources/file_manager/js/image_editor/gallery_demo.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!--
-  -- Copyright (c) 2011 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.
-  -->
-<html>
-<head>
-  <script type="text/javascript" src="../file_type.js"></script>
-  <script type="text/javascript" src="../metadata_provider.js"></script>
-  <script type="text/javascript" src="../metrics.js"></script>
-  <script type="text/javascript" src="../mock_chrome.js"></script>
-  <script type="text/javascript" src="gallery_demo.js"></script>
-
-  <style type="text/css">
-    body {
-      -webkit-user-select: none;
-      margin: 0
-    }
-
-    .gallery-frame {
-      width: 100%;
-      height: 100%;
-      border: none;
-    }
-
-    .gallery-frame.chromebook {
-      width: 1280px;
-      height: 700px;
-    }
-
-    .debug-buttons {
-      position: absolute;
-      color: white;
-      left: 1px;
-      top: 1px;
-    }
-
-    .debug-output {
-      position: absolute;
-      left: 4px;
-      top: 28px;
-      text-align: left;
-      color: white;
-      opacity: 0.3;
-    }
-
-    .debug-output:hover {
-      opacity: 1;
-    }
-  </style>
-
-</head>
-<body>
-  <iframe class="gallery-frame"
-          scrolling="no"
-          src="gallery.html"
-          webkitallowfullscreen
-          onload="loadGallery()"/>
-  </iframe>
-
-  <div class="debug-buttons">
-    <input type="checkbox" onchange="toggleSize(this);"/>
-    <span>Chromebook size</span>
-    <button onclick="loadGallery()">Test grid</button>
-    <input type="file" multiple onchange="loadGallery(this.files)"/>
-  </div>
-
-  <div class="debug-output"></div>
-</body>
-</html>
\ No newline at end of file
diff --git a/chrome/browser/resources/file_manager/js/image_editor/image_editor.css b/chrome/browser/resources/file_manager/js/image_editor/image_editor.css
deleted file mode 100644
index 31c6847..0000000
--- a/chrome/browser/resources/file_manager/js/image_editor/image_editor.css
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2011 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.
- */
-
-/* Main container div for the editor */
-.image-editor {
-  background: black;
-  width: 100%;
-  height: 100%;
-}
-
-/* Editor toolbar */
-.toolbar {
-  width: 100%;
-  height: 100%;
-  display: -webkit-box;
-  -webkit-box-orient: horizontal;
-  -webkit-box-align: center;
-  -webkit-box-pack: center;
-}
-
-.toolbar button {
-  margin: 3px;
-  height: 26px;
-}
-
-.toolbar input {
-  width: 200px;
-}
-
-.toolbar span {
-  margin-left: 10px;
-  margin-right: 10px;
-}
-
-/* The container div for the main canvas */
-.canvas-wrapper {
-  width: 100%;
-  height: 100%;
-  background: black;
-}
-
-/* Scaling controls */
-.scale-tool {
-  position: absolute;
-  width: 305px;
-  height: 43px;
-  right: 0;
-  bottom: 0;
-  border: 1px solid black;
-  border-right-width: 0;
-  border-bottom-width: 0;
-  background: white;
-}
-
-.size-div {
-  position: absolute;
-  right: 2px;
-}
-
-.scale-div {
-  position: absolute;
-  width: 100%;
-  top: 18px;
-}
-
-.scale-div button{
-  position: absolute;
-  width: 23px;
-  height: 23px;
-  top: 1px;
-}
-
-.scale-div .scale-down{
-  left: 1px;
-}
-
-.scale-div input{
-  position: absolute;
-  left: 24px;
-  top: 0;
-  width: 150px;
-}
-
-.scale-div span{
-  position: absolute;
-  left: 180px;
-  top: 2px;
-}
-
-.scale-div .scale-up{
-  right: 63px;
-}
-
-.scale-div .scale-1to1{
-  width: 32px;
-  right: 29px;
-}
-
-.scale-div .scale-fit{
-  width: 26px;
-  right: 1px;
-}
-
diff --git a/chrome/browser/resources/file_manager/js/audio_player.js b/chrome/browser/resources/file_manager/js/media/audio_player.js
index 564055b..564055b 100644
--- a/chrome/browser/resources/file_manager/js/audio_player.js
+++ b/chrome/browser/resources/file_manager/js/media/audio_player.js
diff --git a/chrome/browser/resources/file_manager/js/image_editor/media_controls.js b/chrome/browser/resources/file_manager/js/media/media_controls.js
index 3994bbd..3994bbd 100644
--- a/chrome/browser/resources/file_manager/js/image_editor/media_controls.js
+++ b/chrome/browser/resources/file_manager/js/media/media_controls.js
diff --git a/chrome/browser/resources/file_manager/js/byte_reader.js b/chrome/browser/resources/file_manager/js/metadata/byte_reader.js
index 505473c..505473c 100644
--- a/chrome/browser/resources/file_manager/js/byte_reader.js
+++ b/chrome/browser/resources/file_manager/js/metadata/byte_reader.js
diff --git a/chrome/browser/resources/file_manager/js/exif_parser.js b/chrome/browser/resources/file_manager/js/metadata/exif_parser.js
index 8279564..8279564 100644
--- a/chrome/browser/resources/file_manager/js/exif_parser.js
+++ b/chrome/browser/resources/file_manager/js/metadata/exif_parser.js
diff --git a/chrome/browser/resources/file_manager/js/function_parallel.js b/chrome/browser/resources/file_manager/js/metadata/function_parallel.js
index a2925ac..a2925ac 100644
--- a/chrome/browser/resources/file_manager/js/function_parallel.js
+++ b/chrome/browser/resources/file_manager/js/metadata/function_parallel.js
diff --git a/chrome/browser/resources/file_manager/js/function_sequence.js b/chrome/browser/resources/file_manager/js/metadata/function_sequence.js
index 1541d63..1541d63 100644
--- a/chrome/browser/resources/file_manager/js/function_sequence.js
+++ b/chrome/browser/resources/file_manager/js/metadata/function_sequence.js
diff --git a/chrome/browser/resources/file_manager/js/id3_parser.js b/chrome/browser/resources/file_manager/js/metadata/id3_parser.js
index 273ec4d..96a60af 100644
--- a/chrome/browser/resources/file_manager/js/id3_parser.js
+++ b/chrome/browser/resources/file_manager/js/metadata/id3_parser.js
@@ -4,7 +4,6 @@
 
 importScripts('function_sequence.js');
 importScripts('function_parallel.js');
-importScripts('util.js');
 
 function Id3Parser(parent) {
   MetadataParser.call(this, parent, 'id3', /\.(mp3)$/i);
diff --git a/chrome/browser/resources/file_manager/js/image_parsers.js b/chrome/browser/resources/file_manager/js/metadata/image_parsers.js
index e467a3e..ed8c528 100644
--- a/chrome/browser/resources/file_manager/js/image_parsers.js
+++ b/chrome/browser/resources/file_manager/js/metadata/image_parsers.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
diff --git a/chrome/browser/resources/file_manager/js/metadata_dispatcher.js b/chrome/browser/resources/file_manager/js/metadata/metadata_dispatcher.js
index 144b580..2c3c0dd 100644
--- a/chrome/browser/resources/file_manager/js/metadata_dispatcher.js
+++ b/chrome/browser/resources/file_manager/js/metadata/metadata_dispatcher.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -12,6 +12,7 @@ var global = self;
 // line.
 importScripts('metadata_parser.js');
 importScripts('byte_reader.js');
+importScripts('../util.js');
 
 /**
  * Dispatches metadata requests to the correct parser.
diff --git a/chrome/browser/resources/file_manager/js/metadata_parser.js b/chrome/browser/resources/file_manager/js/metadata/metadata_parser.js
index 094775c..094775c 100644
--- a/chrome/browser/resources/file_manager/js/metadata_parser.js
+++ b/chrome/browser/resources/file_manager/js/metadata/metadata_parser.js
diff --git a/chrome/browser/resources/file_manager/js/metadata_provider.js b/chrome/browser/resources/file_manager/js/metadata/metadata_provider.js
index 7973660..e49f452 100644
--- a/chrome/browser/resources/file_manager/js/metadata_provider.js
+++ b/chrome/browser/resources/file_manager/js/metadata/metadata_provider.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -15,7 +15,7 @@ function MetadataProvider(opt_workerPath) {
     var path = document.location.pathname;
     opt_workerPath = document.location.origin +
         path.substring(0, path.lastIndexOf('/') + 1) +
-        'js/metadata_dispatcher.js';
+        'js/metadata/metadata_dispatcher.js';
   }
 
   this.dispatcher_ = new Worker(opt_workerPath);
diff --git a/chrome/browser/resources/file_manager/js/mpeg_parser.js b/chrome/browser/resources/file_manager/js/metadata/mpeg_parser.js
index b2458cb..b2458cb 100644
--- a/chrome/browser/resources/file_manager/js/mpeg_parser.js
+++ b/chrome/browser/resources/file_manager/js/metadata/mpeg_parser.js
diff --git a/chrome/browser/resources/file_manager/main.html b/chrome/browser/resources/file_manager/main.html
index 0652bbd..1a351c4 100644
--- a/chrome/browser/resources/file_manager/main.html
+++ b/chrome/browser/resources/file_manager/main.html
@@ -99,7 +99,7 @@
     <script src="js/file_manager_pyauto.js"></script>
     <script src="js/file_type.js"></script>
     <script src="js/main.js"></script>
-    <script src="js/metadata_provider.js"></script>
+    <script src="js/metadata/metadata_provider.js"></script>
 
     <!-- For accurate load performance tracking
          place all scripts above this line -->
diff --git a/chrome/browser/resources/file_manager/mediaplayer.html b/chrome/browser/resources/file_manager/mediaplayer.html
index 0a2ffdd..baa04ff 100644
--- a/chrome/browser/resources/file_manager/mediaplayer.html
+++ b/chrome/browser/resources/file_manager/mediaplayer.html
@@ -2,12 +2,12 @@
         "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-  <link rel="stylesheet" type="text/css" href="js/image_editor/media_controls.css"/>
+  <link rel="stylesheet" type="text/css" href="css/media_controls.css"/>
   <link rel="stylesheet" type="text/css" href="css/audio_player.css"/>
 
-  <script src="js/audio_player.js"></script>
-  <script src="js/image_editor/media_controls.js"></script>
-  <script src="js/metadata_provider.js"></script>
+  <script src="js/media/audio_player.js"></script>
+  <script src="js/media/media_controls.js"></script>
+  <script src="js/metadata/metadata_provider.js"></script>
 </head>
 <body>
   <div class="audio-player"></div>
diff --git a/chrome/browser/resources/file_manager/playlist.html b/chrome/browser/resources/file_manager/playlist.html
deleted file mode 100644
index 56a6ffa..0000000
--- a/chrome/browser/resources/file_manager/playlist.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE HTML>
-<html i18n-values="dir:textdirection;">
-<head>
-<meta charset="utf-8">
-<title>Media Playlist</title>
-<style type="text/css">
-body {
-  background: #080809;
-}
-
-.playlist {
-  width: 100%;
-  height: 100%;
-  background: #080809;
-  color: #8AACE7;
-  font-size: .7em;
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-
-.playlistitem {
-  width: 100%;
-  padding: 6px;
-  cursor: pointer;
-}
-
-.playing {
-  background: #393b41;
-  color: #dddde7;
-  font-weight: bold;
-}
-
-.tracknum {
-  width: 20px;
-  position: relative;
-  float: left;
-}
-
-.title {
-
-}
-
-.innertitle {
-  text-decoration: line-through;
-}
-
-.error {
-  color: red;
-  float: left;
-  padding-right: 5px;
-}
-
-</style>
-<script src="chrome://resources/js/local_strings.js"></script>
-<script>
-
-function $(o) {
-  return document.getElementById(o);
-}
-
-function pathIsVideoFile(path) {
-  return /\.(mp4|ogg|mpg|avi)$/i.test(path);
-};
-
-function pathIsAudioFile(path) {
-  return /\.(mp3|m4a)$/i.test(path);
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Document Functions:
-/**
- * Window onload handler, sets up the page.
- */
-
-var currentPlaylist = null;
-var currentOffset = -1;
-function load() {
-  document.body.addEventListener('dragover', function(e) {
-    if (e.preventDefault) e.preventDefault();
-  });
-  document.body.addEventListener('drop', function(e) {
-    if (e.preventDefault) e.preventDefault();
-  });
-  chrome.mediaPlayerPrivate.getPlaylist(false, getPlaylistCallback);
-  chrome.mediaPlayerPrivate.onPlaylistChanged.addListener(function() {
-    chrome.mediaPlayerPrivate.getPlaylist(false, getPlaylistCallback);
-  });
-};
-
-function getDisplayNameFromPath(path) {
-  slash = path.lastIndexOf("/")
-  if (slash != -1) {
-    fileName = path.substring(slash+1,path.length)
-    return fileName;
-  } else {
-    return path;
-  }
-};
-
-function setPlaylistOffset(offset) {
-  chrome.mediaPlayerPrivate.playAt(offset);
-};
-
-function updateUI() {
-  var main = $('main');
-  if (currentPlaylist) {
-    main.textContent = '';
-    var main = $('main');
-    for (var x = 0; x < currentPlaylist.length; x++) {
-      var rowdiv = document.createElement('div');
-      rowdiv.className = 'playlistitem';
-
-      var numberdiv = document.createElement('div');
-      numberdiv.className = 'tracknum';
-      numberdiv.textContent = '' + (x + 1);
-      rowdiv.appendChild(numberdiv);
-
-      var titlediv = document.createElement('div');
-      if (currentPlaylist[x].error) {
-        var errormark = document.createElement('div');
-        errormark.className = 'error';
-        errormark.textContent = 'X';
-        var innertitle = document.createElement('div');
-        innertitle.className = 'innertitle';
-        innertitle.textContent = 
-          decodeURI(getDisplayNameFromPath(currentPlaylist[x].path));
-        titlediv.appendChild(errormark);
-        titlediv.appendChild(innertitle);
-      } else {
-        titlediv.className = 'title';
-        titlediv.textContent = 
-          decodeURI(getDisplayNameFromPath(currentPlaylist[x].path));
-      }
-      rowdiv.appendChild(titlediv);
-      rowdiv.onclick = new Function('setPlaylistOffset(' + x + ')');
-      if (currentOffset == x) {
-        rowdiv.className = 'playlistitem playing';
-      }
-      main.appendChild(rowdiv);
-    }
-  }
-};
-
-function getPlaylistCallback(playlist) {
-  currentPlaylist = playlist.items;
-  currentOffset = playlist.position;
-  updateUI();
-};
-</script>
-<body onload='load();' onselectstart='return false'>
-<div id='main' class='playlist'>
-</div>
-</body>
-</html>