From 2a7444d52ebf39d5c3db779d75d1a1c440a9902b Mon Sep 17 00:00:00 2001
From: "pkasting@chromium.org"
 <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 13 Jul 2010 22:57:54 +0000
Subject: Clean up browser_resources.grd: * Flatten HTML where possible * Move
 resources only referenced by files in browser/resources/ into there (and out
 of the theme dir) * Remove duplicate/unreferenced resources * Remove IDs for
 resources that are inlined due to flattening * Remove
 IDR_CHAT_MANAGER_MANIFEST but leave the files on disk (they will be moving
 elsewhere some time soon)

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2897015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52239 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/resources/about_memory.html           |   4 ++--
 chrome/browser/resources/about_memory_linux.html     |   4 ++--
 chrome/browser/resources/about_memory_mac.html       |   4 ++--
 chrome/browser/resources/about_sys.html              |   2 +-
 chrome/browser/resources/app_gallery_icon.png        | Bin 6497 -> 0 bytes
 chrome/browser/resources/downloads.html              |   2 +-
 chrome/browser/resources/extensions_ui.html          |   6 +++---
 chrome/browser/resources/filebrowse.html             |  18 +++++++++---------
 chrome/browser/resources/gear.png                    | Bin 357 -> 0 bytes
 chrome/browser/resources/gray.png                    | Bin 161 -> 0 bytes
 chrome/browser/resources/help.gif                    | Bin 205 -> 0 bytes
 chrome/browser/resources/history.html                |   4 ++--
 chrome/browser/resources/history2.html               |   4 ++--
 chrome/browser/resources/incognito_tab.html          |   2 +-
 chrome/browser/resources/media_common.js             |  19 -------------------
 chrome/browser/resources/mediaplayer.html            |  18 +++++++++---------
 chrome/browser/resources/minus.png                   | Bin 320 -> 0 bytes
 chrome/browser/resources/new_new_tab.css             |   6 +++---
 chrome/browser/resources/ntp/checkbox_black.png      | Bin 0 -> 192 bytes
 chrome/browser/resources/ntp/checkbox_white.png      | Bin 0 -> 200 bytes
 chrome/browser/resources/ntp/closed_window.png       | Bin 0 -> 272 bytes
 chrome/browser/resources/ntp/most_visited.css        |  18 +++++++++---------
 chrome/browser/resources/ntp/ntp_close.png           | Bin 0 -> 178 bytes
 chrome/browser/resources/ntp/ntp_close_h.png         | Bin 0 -> 175 bytes
 chrome/browser/resources/ntp/ntp_close_p.png         | Bin 0 -> 196 bytes
 chrome/browser/resources/ntp/ntp_pin_off.png         | Bin 0 -> 196 bytes
 chrome/browser/resources/ntp/ntp_pin_off_h.png       | Bin 0 -> 202 bytes
 chrome/browser/resources/ntp/ntp_pin_off_p.png       | Bin 0 -> 237 bytes
 chrome/browser/resources/ntp/ntp_pin_on.png          | Bin 0 -> 218 bytes
 chrome/browser/resources/ntp/ntp_pin_on_h.png        | Bin 0 -> 219 bytes
 chrome/browser/resources/ntp/ntp_pin_on_p.png        | Bin 0 -> 239 bytes
 chrome/browser/resources/phishing_icon.png           | Bin 4645 -> 0 bytes
 chrome/browser/resources/plugins.html                |   4 ++--
 chrome/browser/resources/plus.png                    | Bin 336 -> 0 bytes
 .../resources/safe_browsing_malware_block.html       |   2 +-
 .../safe_browsing_multiple_threat_block.html         |   2 +-
 .../resources/safe_browsing_phishing_block.html      |   2 +-
 .../resources/shared/images/downloads_section.png    | Bin 0 -> 4468 bytes
 .../resources/shared/images/filebrowse_back.png      | Bin 0 -> 3090 bytes
 .../shared/images/filebrowse_fullscreen.png          | Bin 0 -> 1005 bytes
 .../resources/shared/images/filebrowse_menu.png      | Bin 0 -> 2853 bytes
 chrome/browser/resources/shared/images/gear.png      | Bin 0 -> 357 bytes
 chrome/browser/resources/shared/images/help.gif      | Bin 0 -> 205 bytes
 .../resources/shared/images/history_section.png      | Bin 0 -> 4949 bytes
 chrome/browser/resources/shared/images/icon_file.png | Bin 0 -> 177 bytes
 .../browser/resources/shared/images/icon_folder.png  | Bin 0 -> 170 bytes
 .../browser/resources/shared/images/icon_media.png   | Bin 0 -> 188 bytes
 .../browser/resources/shared/images/icon_photo.png   | Bin 0 -> 233 bytes
 .../shared/images/mediaplayer_full_screen.png        | Bin 0 -> 773 bytes
 .../resources/shared/images/mediaplayer_next.png     | Bin 0 -> 388 bytes
 .../resources/shared/images/mediaplayer_pause.png    | Bin 0 -> 214 bytes
 .../resources/shared/images/mediaplayer_play.png     | Bin 0 -> 340 bytes
 .../resources/shared/images/mediaplayer_playlist.png | Bin 0 -> 121 bytes
 .../resources/shared/images/mediaplayer_prev.png     | Bin 0 -> 407 bytes
 .../resources/shared/images/mediaplayer_vol_high.png | Bin 0 -> 643 bytes
 .../resources/shared/images/mediaplayer_vol_mute.png | Bin 0 -> 649 bytes
 chrome/browser/resources/shared/images/minus.png     | Bin 0 -> 320 bytes
 .../resources/shared/images/otr_icon_standalone.png  | Bin 0 -> 1544 bytes
 .../resources/shared/images/phishing_icon.png        | Bin 0 -> 4645 bytes
 chrome/browser/resources/shared/images/plus.png      | Bin 0 -> 336 bytes
 .../browser/resources/shared/images/star_small.png   | Bin 0 -> 556 bytes
 chrome/browser/resources/shared/js/media_common.js   |  19 +++++++++++++++++++
 chrome/browser/resources/slideshow.html              |   6 +++---
 63 files changed, 73 insertions(+), 73 deletions(-)
 delete mode 100644 chrome/browser/resources/app_gallery_icon.png
 delete mode 100644 chrome/browser/resources/gear.png
 delete mode 100644 chrome/browser/resources/gray.png
 delete mode 100644 chrome/browser/resources/help.gif
 delete mode 100644 chrome/browser/resources/media_common.js
 delete mode 100644 chrome/browser/resources/minus.png
 create mode 100644 chrome/browser/resources/ntp/checkbox_black.png
 create mode 100644 chrome/browser/resources/ntp/checkbox_white.png
 create mode 100644 chrome/browser/resources/ntp/closed_window.png
 create mode 100644 chrome/browser/resources/ntp/ntp_close.png
 create mode 100644 chrome/browser/resources/ntp/ntp_close_h.png
 create mode 100644 chrome/browser/resources/ntp/ntp_close_p.png
 create mode 100644 chrome/browser/resources/ntp/ntp_pin_off.png
 create mode 100644 chrome/browser/resources/ntp/ntp_pin_off_h.png
 create mode 100644 chrome/browser/resources/ntp/ntp_pin_off_p.png
 create mode 100644 chrome/browser/resources/ntp/ntp_pin_on.png
 create mode 100644 chrome/browser/resources/ntp/ntp_pin_on_h.png
 create mode 100644 chrome/browser/resources/ntp/ntp_pin_on_p.png
 delete mode 100644 chrome/browser/resources/phishing_icon.png
 delete mode 100644 chrome/browser/resources/plus.png
 create mode 100644 chrome/browser/resources/shared/images/downloads_section.png
 create mode 100644 chrome/browser/resources/shared/images/filebrowse_back.png
 create mode 100644 chrome/browser/resources/shared/images/filebrowse_fullscreen.png
 create mode 100644 chrome/browser/resources/shared/images/filebrowse_menu.png
 create mode 100644 chrome/browser/resources/shared/images/gear.png
 create mode 100644 chrome/browser/resources/shared/images/help.gif
 create mode 100644 chrome/browser/resources/shared/images/history_section.png
 create mode 100644 chrome/browser/resources/shared/images/icon_file.png
 create mode 100644 chrome/browser/resources/shared/images/icon_folder.png
 create mode 100644 chrome/browser/resources/shared/images/icon_media.png
 create mode 100644 chrome/browser/resources/shared/images/icon_photo.png
 create mode 100644 chrome/browser/resources/shared/images/mediaplayer_full_screen.png
 create mode 100644 chrome/browser/resources/shared/images/mediaplayer_next.png
 create mode 100644 chrome/browser/resources/shared/images/mediaplayer_pause.png
 create mode 100644 chrome/browser/resources/shared/images/mediaplayer_play.png
 create mode 100644 chrome/browser/resources/shared/images/mediaplayer_playlist.png
 create mode 100644 chrome/browser/resources/shared/images/mediaplayer_prev.png
 create mode 100644 chrome/browser/resources/shared/images/mediaplayer_vol_high.png
 create mode 100644 chrome/browser/resources/shared/images/mediaplayer_vol_mute.png
 create mode 100644 chrome/browser/resources/shared/images/minus.png
 create mode 100644 chrome/browser/resources/shared/images/otr_icon_standalone.png
 create mode 100644 chrome/browser/resources/shared/images/phishing_icon.png
 create mode 100644 chrome/browser/resources/shared/images/plus.png
 create mode 100644 chrome/browser/resources/shared/images/star_small.png
 create mode 100644 chrome/browser/resources/shared/js/media_common.js

(limited to 'chrome/browser/resources')

diff --git a/chrome/browser/resources/about_memory.html b/chrome/browser/resources/about_memory.html
index 6259052..0dbc2a1 100644
--- a/chrome/browser/resources/about_memory.html
+++ b/chrome/browser/resources/about_memory.html
@@ -69,7 +69,7 @@ div#header h1 {
   padding-left: 37px;
   margin: 0;
   display: inline;
-  background: url('gear.png') 12px 60% no-repeat;
+  background: url('shared/images/gear.png') 12px 60% no-repeat;
   color: white;
 }
 div#header p {
@@ -290,7 +290,7 @@ div.help {
   width: 14px;
   margin: -1px 0;
   height: 14px;
-  background: url('help.gif') center bottom no-repeat;
+  background: url('shared/images/help.gif') center bottom no-repeat;
   opacity: 0.33;
 }
 div.help:hover {
diff --git a/chrome/browser/resources/about_memory_linux.html b/chrome/browser/resources/about_memory_linux.html
index 2e92150..0d4c904 100644
--- a/chrome/browser/resources/about_memory_linux.html
+++ b/chrome/browser/resources/about_memory_linux.html
@@ -69,7 +69,7 @@ div#header h1 {
   padding-left: 37px;
   margin: 0;
   display: inline;
-  background: url('gear.png') 12px 60% no-repeat;
+  background: url('shared/images/gear.png') 12px 60% no-repeat;
   color: white;
 }
 div#header p {
@@ -288,7 +288,7 @@ div.help {
   width: 14px;
   margin: -1px 0;
   height: 14px;
-  background: url('help.gif') center bottom no-repeat;
+  background: url('shared/images/help.gif') center bottom no-repeat;
   opacity: 0.33;
 }
 div.help:hover {
diff --git a/chrome/browser/resources/about_memory_mac.html b/chrome/browser/resources/about_memory_mac.html
index ebdfd12..299a875 100644
--- a/chrome/browser/resources/about_memory_mac.html
+++ b/chrome/browser/resources/about_memory_mac.html
@@ -69,7 +69,7 @@ div#header h1 {
   padding-left: 37px;
   margin: 0;
   display: inline;
-  background: url('gear.png') 12px 60% no-repeat;
+  background: url('shared/images/gear.png') 12px 60% no-repeat;
   color: white;
 }
 div#header p {
@@ -288,7 +288,7 @@ div.help {
   width: 14px;
   margin: -1px 0;
   height: 14px;
-  background: url('help.gif') center bottom no-repeat;
+  background: url('shared/images/help.gif') center bottom no-repeat;
   opacity: 0.33;
 }
 div.help:hover {
diff --git a/chrome/browser/resources/about_sys.html b/chrome/browser/resources/about_sys.html
index 4c88c54..dbae643 100644
--- a/chrome/browser/resources/about_sys.html
+++ b/chrome/browser/resources/about_sys.html
@@ -55,7 +55,7 @@ div#header h1 {
   padding-left: 3em;
   margin: 0;
   display: inline;
-  background: url('gear.png') 12px 60% no-repeat;
+  background: url('shared/images/gear.png') 12px 60% no-repeat;
   color: white;
 }
 div#header p {
diff --git a/chrome/browser/resources/app_gallery_icon.png b/chrome/browser/resources/app_gallery_icon.png
deleted file mode 100644
index d45242d..0000000
Binary files a/chrome/browser/resources/app_gallery_icon.png and /dev/null differ
diff --git a/chrome/browser/resources/downloads.html b/chrome/browser/resources/downloads.html
index 0cfbae5..77b60f1 100644
--- a/chrome/browser/resources/downloads.html
+++ b/chrome/browser/resources/downloads.html
@@ -759,7 +759,7 @@ function downloadUpdated(results) {
 <body onload="load();" i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
 <div class="header">
   <a href="" onclick="setSearch(''); return false;">
-    <img src="../../app/theme/downloads_section.png"
+    <img src="shared/images/downloads_section.png"
          width="67" height="67" class="logo" border="0" /></a>
   <form method="post" action=""
       onsubmit="setSearch(this.term.value); return false;"
diff --git a/chrome/browser/resources/extensions_ui.html b/chrome/browser/resources/extensions_ui.html
index 1db6d5a..7b58fae 100644
--- a/chrome/browser/resources/extensions_ui.html
+++ b/chrome/browser/resources/extensions_ui.html
@@ -140,7 +140,7 @@ html[dir=rtl] .developer-mode {
 }
 
 .extension_disabled td {
-  background: url('gray.png') 0px 0px;
+  background-color: #f0f0f0;
   color: #a0a0a0;
   padding-bottom: 4px;
   padding-top: 5px;
@@ -770,9 +770,9 @@ document.addEventListener('DOMContentLoaded', requestExtensionsData);
             <td width="18" padding="">
               <img id="collapse" class="developer-mode-image"
                    style="display:none" onclick="toggleDeveloperMode();"
-                   src="minus.png">
+                   src="shared/images/minus.png">
               <img id="expand" class="developer-mode-image"
-                   onclick="toggleDeveloperMode();" src="plus.png">
+                   onclick="toggleDeveloperMode();" src="shared/images/plus.png">
             </td>
             <td width="50" align="right">
               <div class="developer-mode-link">
diff --git a/chrome/browser/resources/filebrowse.html b/chrome/browser/resources/filebrowse.html
index 36c7c9a..8b01ade 100644
--- a/chrome/browser/resources/filebrowse.html
+++ b/chrome/browser/resources/filebrowse.html
@@ -149,7 +149,7 @@ ul.filebrowselist {
   height: 50px;
   z-index: 999999;
   cursor: pointer;
-  background: url('../../app/theme/filebrowse_fullscreen.png');
+  background: url('shared/images/filebrowse_fullscreen.png');
   position: absolute;
   background-repeat: no-repeat;
 }
@@ -170,7 +170,7 @@ li.filebrowserow div.icon {
 }
 
 .menuicon {
-  background: url('../../app/theme/filebrowse_menu.png');
+  background: url('shared/images/filebrowse_menu.png');
   position: absolute;
   right: 4px;
   top: 5px;
@@ -328,23 +328,23 @@ div.columnlist {
 }
 
 div.iconmedia {
-  background: url('../../app/theme/icon_media.png');
+  background: url('shared/images/icon_media.png');
 }
 
 div.iconfolder {
-  background: url('../../app/theme/icon_folder.png');
+  background: url('shared/images/icon_folder.png');
 }
 
 div.iconfile {
-  background: url('../../app/theme/icon_file.png');
+  background: url('shared/images/icon_file.png');
 }
 
 div.iconphoto {
-  background: url('../../app/theme/icon_photo.png');
+  background: url('shared/images/icon_photo.png');
 }
 
 div.iconmusic {
-  background: url('../../app/theme/icon_media.png');
+  background: url('shared/images/icon_media.png');
 }
 
 div.backbutton {
@@ -552,7 +552,7 @@ div.fullcontainer {
 
 </style>
 <script src="shared/js/local_strings.js"></script>
-<script src="media_common.js"></script>
+<script src="shared/js/media_common.js"></script>
 <script>
 
 
@@ -1550,7 +1550,7 @@ function createNewList(title, results, main, path) {
 <body onload='load();' onclick='clearMenus()' onselectstart='return false'>
 <div id='header' class=''>
   <div id='back' class='backbutton controlbutton' onclick='goBackInList();return false;'>
-    <img src="../../app/theme/filebrowse_back.png" width='100%' height='100%'>
+    <img src="shared/images/filebrowse_back.png" width='100%' height='100%'>
   </div>
   <div id='currenttitle' class=''></div>
 </div><br>
diff --git a/chrome/browser/resources/gear.png b/chrome/browser/resources/gear.png
deleted file mode 100644
index 3dce105..0000000
Binary files a/chrome/browser/resources/gear.png and /dev/null differ
diff --git a/chrome/browser/resources/gray.png b/chrome/browser/resources/gray.png
deleted file mode 100644
index 13851ad..0000000
Binary files a/chrome/browser/resources/gray.png and /dev/null differ
diff --git a/chrome/browser/resources/help.gif b/chrome/browser/resources/help.gif
deleted file mode 100644
index f49c094..0000000
Binary files a/chrome/browser/resources/help.gif and /dev/null differ
diff --git a/chrome/browser/resources/history.html b/chrome/browser/resources/history.html
index d102f18..8f29115 100644
--- a/chrome/browser/resources/history.html
+++ b/chrome/browser/resources/history.html
@@ -1135,7 +1135,7 @@ html[dir='rtl'] .time {
   margin-top:18px;
 }
 .title > .starred {
-  background:url('../../app/theme/star_small.png');
+  background:url('shared/images/star_small.png');
   background-repeat:no-repeat;
   display:inline-block;
   margin-left:12px;
@@ -1172,7 +1172,7 @@ html[dir='rtl'] .entry .title > a {
 <body onload="load();" i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
 <div class="header">
   <a href="" onclick="setSearch(''); return false;">
-    <img src="../../app/theme/history_section.png"
+    <img src="shared/images/history_section.png"
          width="67" height="67" class="logo" border="0"></a>
   <form method="post" action=""
       onsubmit="setSearch(this.term.value); return false;"
diff --git a/chrome/browser/resources/history2.html b/chrome/browser/resources/history2.html
index 6d75f727..a2a2ca3 100644
--- a/chrome/browser/resources/history2.html
+++ b/chrome/browser/resources/history2.html
@@ -1136,7 +1136,7 @@ html[dir='rtl'] .time {
   margin-top:18px;
 }
 .title > .starred {
-  background:url('../../app/theme/star_small.png');
+  background:url('shared/images/star_small.png');
   background-repeat:no-repeat;
   display:inline-block;
   margin-left:12px;
@@ -1173,7 +1173,7 @@ html[dir='rtl'] .entry .title > a {
 <body onload="load();" i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
 <div class="header">
   <a href="" onclick="setSearch(''); return false;">
-    <img src="../../app/theme/history_section.png"
+    <img src="shared/images/history_section.png"
          width="67" height="67" class="logo" border="0"></a>
   Debug: this is History 2
   <form method="post" action=""
diff --git a/chrome/browser/resources/incognito_tab.html b/chrome/browser/resources/incognito_tab.html
index cdff80a..3f40fe3 100644
--- a/chrome/browser/resources/incognito_tab.html
+++ b/chrome/browser/resources/incognito_tab.html
@@ -48,7 +48,7 @@ document.write('<link id="incognitothemecss" rel="stylesheet" ' +
 </head>
 <body>
 <div class="content" i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
-  <img src="../../app/theme/otr_icon_standalone.png" class="icon" />
+  <img src="shared/images/otr_icon_standalone.png" class="icon" />
   <span i18n-values=".innerHTML:content"></span>
 </div>
 <div class="extensionsmessage" i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
diff --git a/chrome/browser/resources/media_common.js b/chrome/browser/resources/media_common.js
deleted file mode 100644
index 8528809..0000000
--- a/chrome/browser/resources/media_common.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2010 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.
-
-function pathIsVideoFile(path) {
-  return /\.(mp4|ogg|mpg|avi|mov)$/i.test(path);
-}
-
-function pathIsAudioFile(path) {
-  return /\.(mp3|m4a|wav)$/i.test(path);
-}
-
-function pathIsImageFile(path) {
-  return /\.(jpg|png|gif)$/i.test(path);
-}
-
-function pathIsHtmlFile(path) {
-  return /\.(htm|html|txt)$/i.test(path);
-}
diff --git a/chrome/browser/resources/mediaplayer.html b/chrome/browser/resources/mediaplayer.html
index 762f356..09f7b1e 100644
--- a/chrome/browser/resources/mediaplayer.html
+++ b/chrome/browser/resources/mediaplayer.html
@@ -133,11 +133,11 @@ body {
 }
 
 .soundiconhigh {
-  background: url('../../app/theme/mediaplayer_vol_high.png');
+  background: url('shared/images/mediaplayer_vol_high.png');
 }
 
 .soundiconmuted {
-  background: url('../../app/theme/mediaplayer_vol_mute.png');
+  background: url('shared/images/mediaplayer_vol_mute.png');
 }
 
 .soundiconhigh,
@@ -170,7 +170,7 @@ body {
 }
 
 .fullscreenicon {
-  background: url('../../app/theme/mediaplayer_full_screen.png');
+  background: url('shared/images/mediaplayer_full_screen.png');
   background-repeat: no-repeat;
   background-position: 6px 8px;
 }
@@ -193,7 +193,7 @@ body {
 }
 
 .playicon {
-  background: url('../../app/theme/mediaplayer_play.png');
+  background: url('shared/images/mediaplayer_play.png');
   background-repeat: no-repeat;
   background-position: 9px 8px;
 }
@@ -207,7 +207,7 @@ body {
 }
 
 .pauseicon {
-  background: url('../../app/theme/mediaplayer_pause.png');
+  background: url('shared/images/mediaplayer_pause.png');
   background-repeat: no-repeat;
   background-position: 9px 8px;
 }
@@ -220,7 +220,7 @@ body {
 }
 
 .previcon {
-  background: url('../../app/theme/mediaplayer_prev.png');
+  background: url('shared/images/mediaplayer_prev.png');
   background-repeat: no-repeat;
   background-position: 6px 8px;
 }
@@ -259,7 +259,7 @@ body {
 }
 
 .nexticon {
-  background: url('../../app/theme/mediaplayer_next.png');
+  background: url('shared/images/mediaplayer_next.png');
   background-repeat: no-repeat;
   background-position: 6px 8px;
 }
@@ -273,7 +273,7 @@ body {
 }
 
 .playlisticon {
-  background: url('../../app/theme/mediaplayer_playlist.png');
+  background: url('shared/images/mediaplayer_playlist.png');
   background-repeat: no-repeat;
   background-position: 6px 8px;
 }
@@ -301,7 +301,7 @@ body {
 
 </style>
 <script src="shared/js/local_strings.js"></script>
-<script src="media_common.js"></script>
+<script src="shared/js/media_common.js"></script>
 <script>
 
 function $(o) {
diff --git a/chrome/browser/resources/minus.png b/chrome/browser/resources/minus.png
deleted file mode 100644
index 7f8e396..0000000
Binary files a/chrome/browser/resources/minus.png and /dev/null differ
diff --git a/chrome/browser/resources/new_new_tab.css b/chrome/browser/resources/new_new_tab.css
index e7534b8..a201da6 100644
--- a/chrome/browser/resources/new_new_tab.css
+++ b/chrome/browser/resources/new_new_tab.css
@@ -156,7 +156,7 @@ html[dir=rtl] .item {
                         on :hover. To get this to work we have to set visibility
                         to visible which unfortunately breaks the ellipsis for t
                         he window items */
-  background-image: url(chrome://theme/IDR_NEWTAB_CLOSED_WINDOW);
+  background-image: url('ntp/closed_window.png');
 }
 
 .window-menu {
@@ -340,11 +340,11 @@ html[dir=rtl] #option-menu > [command=hide]:before {
 }
 
 #option-menu > [command=hide]:before {
-  background-image: url(chrome://theme/IDR_NEWTAB_CHECKBOX_BLACK);
+  background-image: url('ntp/checkbox_black.png');
 }
 
 #option-menu > [selected][command=hide]:active:before {
-  background-image: url(chrome://theme/IDR_NEWTAB_CHECKBOX_WHITE);
+  background-image: url('ntp/checkbox_white.png');
 }
 
 #attribution {
diff --git a/chrome/browser/resources/ntp/checkbox_black.png b/chrome/browser/resources/ntp/checkbox_black.png
new file mode 100644
index 0000000..3420cd6
Binary files /dev/null and b/chrome/browser/resources/ntp/checkbox_black.png differ
diff --git a/chrome/browser/resources/ntp/checkbox_white.png b/chrome/browser/resources/ntp/checkbox_white.png
new file mode 100644
index 0000000..95d6b13
Binary files /dev/null and b/chrome/browser/resources/ntp/checkbox_white.png differ
diff --git a/chrome/browser/resources/ntp/closed_window.png b/chrome/browser/resources/ntp/closed_window.png
new file mode 100644
index 0000000..b8d35b2
Binary files /dev/null and b/chrome/browser/resources/ntp/closed_window.png differ
diff --git a/chrome/browser/resources/ntp/most_visited.css b/chrome/browser/resources/ntp/most_visited.css
index 5d1dff83..25366b8 100644
--- a/chrome/browser/resources/ntp/most_visited.css
+++ b/chrome/browser/resources/ntp/most_visited.css
@@ -120,39 +120,39 @@
 }
 
 .edit-bar > .pin {
-  background-image: url(chrome://theme/IDR_NEWTAB_PIN_OFF);
+  background-image: url('ntp_pin_off.png');
 }
 
 .edit-bar > .pin:hover {
-  background-image: url(chrome://theme/IDR_NEWTAB_PIN_OFF_H);
+  background-image: url('ntp_pin_off_h.png');
 }
 
 .edit-bar > .pin:active {
-  background-image: url(chrome://theme/IDR_NEWTAB_PIN_OFF_P);
+  background-image: url('ntp_pin_off_p.png');
 }
 
 .pinned .edit-bar > .pin {
-  background-image: url(chrome://theme/IDR_NEWTAB_PIN_ON);
+  background-image: url('ntp_pin_on.png');
 }
 
 .pinned .edit-bar > .pin:hover {
-  background-image: url(chrome://theme/IDR_NEWTAB_PIN_ON_H);
+  background-image: url(ntp_pin_on_h.png');
 }
 
 .pinned .edit-bar > .pin:active {
-  background-image: url(chrome://theme/IDR_NEWTAB_PIN_ON_P);
+  background-image: url(ntp_pin_on_p.png');
 }
 
 .edit-bar > .remove {
-  background-image: url(chrome://theme/IDR_NEWTAB_CLOSE);
+  background-image: url('ntp_close.png');
 }
 
 .edit-bar > .remove:hover {
-  background-image: url(chrome://theme/IDR_NEWTAB_CLOSE_H);
+  background-image: url('ntp_close_h.png');
 }
 
 .edit-bar > .remove:active {
-  background-image: url(chrome://theme/IDR_NEWTAB_CLOSE_P);
+  background-image: url('ntp_close_p.png');
 }
 
 .thumbnail-container > .title > div {
diff --git a/chrome/browser/resources/ntp/ntp_close.png b/chrome/browser/resources/ntp/ntp_close.png
new file mode 100644
index 0000000..031dba6
Binary files /dev/null and b/chrome/browser/resources/ntp/ntp_close.png differ
diff --git a/chrome/browser/resources/ntp/ntp_close_h.png b/chrome/browser/resources/ntp/ntp_close_h.png
new file mode 100644
index 0000000..cd3e978
Binary files /dev/null and b/chrome/browser/resources/ntp/ntp_close_h.png differ
diff --git a/chrome/browser/resources/ntp/ntp_close_p.png b/chrome/browser/resources/ntp/ntp_close_p.png
new file mode 100644
index 0000000..96cf7412
Binary files /dev/null and b/chrome/browser/resources/ntp/ntp_close_p.png differ
diff --git a/chrome/browser/resources/ntp/ntp_pin_off.png b/chrome/browser/resources/ntp/ntp_pin_off.png
new file mode 100644
index 0000000..0e8a718
Binary files /dev/null and b/chrome/browser/resources/ntp/ntp_pin_off.png differ
diff --git a/chrome/browser/resources/ntp/ntp_pin_off_h.png b/chrome/browser/resources/ntp/ntp_pin_off_h.png
new file mode 100644
index 0000000..e271f11
Binary files /dev/null and b/chrome/browser/resources/ntp/ntp_pin_off_h.png differ
diff --git a/chrome/browser/resources/ntp/ntp_pin_off_p.png b/chrome/browser/resources/ntp/ntp_pin_off_p.png
new file mode 100644
index 0000000..eb5e7ff
Binary files /dev/null and b/chrome/browser/resources/ntp/ntp_pin_off_p.png differ
diff --git a/chrome/browser/resources/ntp/ntp_pin_on.png b/chrome/browser/resources/ntp/ntp_pin_on.png
new file mode 100644
index 0000000..29b5457
Binary files /dev/null and b/chrome/browser/resources/ntp/ntp_pin_on.png differ
diff --git a/chrome/browser/resources/ntp/ntp_pin_on_h.png b/chrome/browser/resources/ntp/ntp_pin_on_h.png
new file mode 100644
index 0000000..93ebe83
Binary files /dev/null and b/chrome/browser/resources/ntp/ntp_pin_on_h.png differ
diff --git a/chrome/browser/resources/ntp/ntp_pin_on_p.png b/chrome/browser/resources/ntp/ntp_pin_on_p.png
new file mode 100644
index 0000000..4b3a6b6
Binary files /dev/null and b/chrome/browser/resources/ntp/ntp_pin_on_p.png differ
diff --git a/chrome/browser/resources/phishing_icon.png b/chrome/browser/resources/phishing_icon.png
deleted file mode 100644
index b23e76b..0000000
Binary files a/chrome/browser/resources/phishing_icon.png and /dev/null differ
diff --git a/chrome/browser/resources/plugins.html b/chrome/browser/resources/plugins.html
index fdd5e68..e8b14c5 100644
--- a/chrome/browser/resources/plugins.html
+++ b/chrome/browser/resources/plugins.html
@@ -481,9 +481,9 @@ document.addEventListener('DOMContentLoaded', requestPluginsData);
           <td width="18">
             <img id="collapse" class="tmi-mode-image"
                  style="display:none" onclick="toggleTmiMode();"
-                 src="minus.png">
+                 src="shared/images/minus.png">
             <img id="expand" class="tmi-mode-image"
-                 onclick="toggleTmiMode();" src="plus.png">
+                 onclick="toggleTmiMode();" src="shared/images/plus.png">
           </td>
           <td>
             <div class="tmi-mode-link">
diff --git a/chrome/browser/resources/plus.png b/chrome/browser/resources/plus.png
deleted file mode 100644
index 35e8d6b..0000000
Binary files a/chrome/browser/resources/plus.png and /dev/null differ
diff --git a/chrome/browser/resources/safe_browsing_malware_block.html b/chrome/browser/resources/safe_browsing_malware_block.html
index 45a0eea..d8a5a39 100644
--- a/chrome/browser/resources/safe_browsing_malware_block.html
+++ b/chrome/browser/resources/safe_browsing_malware_block.html
@@ -85,7 +85,7 @@ input {
 <table width="100%" cellspacing="0" cellpadding="0">
   <td class="cell" valign="middle" align="center">
     <div class="box">
-      <div class="icon"><img src="phishing_icon.png" alt="Malware Icon" onmousedown="return false;"/></div>
+      <div class="icon"><img src="shared/images/phishing_icon.png" alt="Malware Icon" onmousedown="return false;"/></div>
       <div class="title" i18n-content="headLine"></div>
       <div class="main" i18n-values=".innerHTML:description1"></div>
       <div class="main" i18n-values=".innerHTML:description2"></div>
diff --git a/chrome/browser/resources/safe_browsing_multiple_threat_block.html b/chrome/browser/resources/safe_browsing_multiple_threat_block.html
index c1aba11..a8aaf70 100644
--- a/chrome/browser/resources/safe_browsing_multiple_threat_block.html
+++ b/chrome/browser/resources/safe_browsing_multiple_threat_block.html
@@ -114,7 +114,7 @@ function takeMeBack() {
 <table width="100%" cellspacing="0" cellpadding="0">
   <td class="cell" valign="middle" align="center">
     <div class="box">
-      <div class="icon"><img src="phishing_icon.png" alt="Malware Icon" onmousedown="return false;"/></div>
+      <div class="icon"><img src="shared/images/phishing_icon.png" alt="Malware Icon" onmousedown="return false;"/></div>
       <div class="title" i18n-content="headLine"></div>
       <div class="main" i18n-values=".innerHTML:description1"></div>
       <div class="main" i18n-content="description2"></div>
diff --git a/chrome/browser/resources/safe_browsing_phishing_block.html b/chrome/browser/resources/safe_browsing_phishing_block.html
index d34e583..46d400a 100644
--- a/chrome/browser/resources/safe_browsing_phishing_block.html
+++ b/chrome/browser/resources/safe_browsing_phishing_block.html
@@ -87,7 +87,7 @@ html[dir='rtl'] .helpbutton {
 <table width="100%" cellspacing="0" cellpadding="0">
   <td class="cell" valign="middle" align="center">
     <div class="box">
-      <div class="icon"><img src="phishing_icon.png" alt="Phishing Warning Icon" onmousedown="return false;"></div>
+      <div class="icon"><img src="shared/images/phishing_icon.png" alt="Phishing Warning Icon" onmousedown="return false;"></div>
       <div class="title" i18n-content="headLine"></div>
       <div class="main" i18n-values=".innerHTML:description1"></div>
       <div class="main"><a href="" i18n-content="description2" onclick="sendCommand('learnMore'); return false;" onmousedown="return false;"></a></div>
diff --git a/chrome/browser/resources/shared/images/downloads_section.png b/chrome/browser/resources/shared/images/downloads_section.png
new file mode 100644
index 0000000..e7a7c2d
Binary files /dev/null and b/chrome/browser/resources/shared/images/downloads_section.png differ
diff --git a/chrome/browser/resources/shared/images/filebrowse_back.png b/chrome/browser/resources/shared/images/filebrowse_back.png
new file mode 100644
index 0000000..0ec8cc7
Binary files /dev/null and b/chrome/browser/resources/shared/images/filebrowse_back.png differ
diff --git a/chrome/browser/resources/shared/images/filebrowse_fullscreen.png b/chrome/browser/resources/shared/images/filebrowse_fullscreen.png
new file mode 100644
index 0000000..92f925d
Binary files /dev/null and b/chrome/browser/resources/shared/images/filebrowse_fullscreen.png differ
diff --git a/chrome/browser/resources/shared/images/filebrowse_menu.png b/chrome/browser/resources/shared/images/filebrowse_menu.png
new file mode 100644
index 0000000..d58dbd0
Binary files /dev/null and b/chrome/browser/resources/shared/images/filebrowse_menu.png differ
diff --git a/chrome/browser/resources/shared/images/gear.png b/chrome/browser/resources/shared/images/gear.png
new file mode 100644
index 0000000..3dce105
Binary files /dev/null and b/chrome/browser/resources/shared/images/gear.png differ
diff --git a/chrome/browser/resources/shared/images/help.gif b/chrome/browser/resources/shared/images/help.gif
new file mode 100644
index 0000000..f49c094
Binary files /dev/null and b/chrome/browser/resources/shared/images/help.gif differ
diff --git a/chrome/browser/resources/shared/images/history_section.png b/chrome/browser/resources/shared/images/history_section.png
new file mode 100644
index 0000000..2640d5ad
Binary files /dev/null and b/chrome/browser/resources/shared/images/history_section.png differ
diff --git a/chrome/browser/resources/shared/images/icon_file.png b/chrome/browser/resources/shared/images/icon_file.png
new file mode 100644
index 0000000..1b11e56
Binary files /dev/null and b/chrome/browser/resources/shared/images/icon_file.png differ
diff --git a/chrome/browser/resources/shared/images/icon_folder.png b/chrome/browser/resources/shared/images/icon_folder.png
new file mode 100644
index 0000000..d994cc21
Binary files /dev/null and b/chrome/browser/resources/shared/images/icon_folder.png differ
diff --git a/chrome/browser/resources/shared/images/icon_media.png b/chrome/browser/resources/shared/images/icon_media.png
new file mode 100644
index 0000000..dcf0cef
Binary files /dev/null and b/chrome/browser/resources/shared/images/icon_media.png differ
diff --git a/chrome/browser/resources/shared/images/icon_photo.png b/chrome/browser/resources/shared/images/icon_photo.png
new file mode 100644
index 0000000..f98e113
Binary files /dev/null and b/chrome/browser/resources/shared/images/icon_photo.png differ
diff --git a/chrome/browser/resources/shared/images/mediaplayer_full_screen.png b/chrome/browser/resources/shared/images/mediaplayer_full_screen.png
new file mode 100644
index 0000000..750c39e
Binary files /dev/null and b/chrome/browser/resources/shared/images/mediaplayer_full_screen.png differ
diff --git a/chrome/browser/resources/shared/images/mediaplayer_next.png b/chrome/browser/resources/shared/images/mediaplayer_next.png
new file mode 100644
index 0000000..9e42b4e
Binary files /dev/null and b/chrome/browser/resources/shared/images/mediaplayer_next.png differ
diff --git a/chrome/browser/resources/shared/images/mediaplayer_pause.png b/chrome/browser/resources/shared/images/mediaplayer_pause.png
new file mode 100644
index 0000000..9b83ca5
Binary files /dev/null and b/chrome/browser/resources/shared/images/mediaplayer_pause.png differ
diff --git a/chrome/browser/resources/shared/images/mediaplayer_play.png b/chrome/browser/resources/shared/images/mediaplayer_play.png
new file mode 100644
index 0000000..e2b4b81
Binary files /dev/null and b/chrome/browser/resources/shared/images/mediaplayer_play.png differ
diff --git a/chrome/browser/resources/shared/images/mediaplayer_playlist.png b/chrome/browser/resources/shared/images/mediaplayer_playlist.png
new file mode 100644
index 0000000..932fd98
Binary files /dev/null and b/chrome/browser/resources/shared/images/mediaplayer_playlist.png differ
diff --git a/chrome/browser/resources/shared/images/mediaplayer_prev.png b/chrome/browser/resources/shared/images/mediaplayer_prev.png
new file mode 100644
index 0000000..c02eccd
Binary files /dev/null and b/chrome/browser/resources/shared/images/mediaplayer_prev.png differ
diff --git a/chrome/browser/resources/shared/images/mediaplayer_vol_high.png b/chrome/browser/resources/shared/images/mediaplayer_vol_high.png
new file mode 100644
index 0000000..3b073b7
Binary files /dev/null and b/chrome/browser/resources/shared/images/mediaplayer_vol_high.png differ
diff --git a/chrome/browser/resources/shared/images/mediaplayer_vol_mute.png b/chrome/browser/resources/shared/images/mediaplayer_vol_mute.png
new file mode 100644
index 0000000..0cf8741
Binary files /dev/null and b/chrome/browser/resources/shared/images/mediaplayer_vol_mute.png differ
diff --git a/chrome/browser/resources/shared/images/minus.png b/chrome/browser/resources/shared/images/minus.png
new file mode 100644
index 0000000..7f8e396
Binary files /dev/null and b/chrome/browser/resources/shared/images/minus.png differ
diff --git a/chrome/browser/resources/shared/images/otr_icon_standalone.png b/chrome/browser/resources/shared/images/otr_icon_standalone.png
new file mode 100644
index 0000000..872120b
Binary files /dev/null and b/chrome/browser/resources/shared/images/otr_icon_standalone.png differ
diff --git a/chrome/browser/resources/shared/images/phishing_icon.png b/chrome/browser/resources/shared/images/phishing_icon.png
new file mode 100644
index 0000000..b23e76b
Binary files /dev/null and b/chrome/browser/resources/shared/images/phishing_icon.png differ
diff --git a/chrome/browser/resources/shared/images/plus.png b/chrome/browser/resources/shared/images/plus.png
new file mode 100644
index 0000000..35e8d6b
Binary files /dev/null and b/chrome/browser/resources/shared/images/plus.png differ
diff --git a/chrome/browser/resources/shared/images/star_small.png b/chrome/browser/resources/shared/images/star_small.png
new file mode 100644
index 0000000..59fe948
Binary files /dev/null and b/chrome/browser/resources/shared/images/star_small.png differ
diff --git a/chrome/browser/resources/shared/js/media_common.js b/chrome/browser/resources/shared/js/media_common.js
new file mode 100644
index 0000000..8528809
--- /dev/null
+++ b/chrome/browser/resources/shared/js/media_common.js
@@ -0,0 +1,19 @@
+// Copyright (c) 2010 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.
+
+function pathIsVideoFile(path) {
+  return /\.(mp4|ogg|mpg|avi|mov)$/i.test(path);
+}
+
+function pathIsAudioFile(path) {
+  return /\.(mp3|m4a|wav)$/i.test(path);
+}
+
+function pathIsImageFile(path) {
+  return /\.(jpg|png|gif)$/i.test(path);
+}
+
+function pathIsHtmlFile(path) {
+  return /\.(htm|html|txt)$/i.test(path);
+}
diff --git a/chrome/browser/resources/slideshow.html b/chrome/browser/resources/slideshow.html
index 6cc7dbd..10ed4cb 100644
--- a/chrome/browser/resources/slideshow.html
+++ b/chrome/browser/resources/slideshow.html
@@ -53,7 +53,7 @@ body {
 }
 
 #prevbutton > div {
-  background: url('../../app/theme/mediaplayer_prev.png');
+  background: url('shared/images/mediaplayer_prev.png');
   background-repeat: no-repeat;
   background-position: 4px 8px;
   width: 100%;
@@ -83,7 +83,7 @@ body {
 }
 
 #nextbutton > div {
-  background: url('../../app/theme/mediaplayer_next.png');
+  background: url('shared/images/mediaplayer_next.png');
   background-repeat: no-repeat;
   background-position: 4px 8px;
   width: 100%;
@@ -112,7 +112,7 @@ button:hover {
 
 </style>
 <script src="shared/js/local_strings.js"></script>
-<script src="media_common.js"></script>
+<script src="shared/js/media_common.js"></script>
 <script>
 
 document.addEventListener('DOMContentLoaded', load);
-- 
cgit v1.1