Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Move shared file type images into chrome://theme/ scheme

These images are used by WebUI code (which uses 2x/ subdirectories for hi-dpi) and by C++ code (which uses the default_###_percent scheme). Move them to chrome/app/theme so that scaling will work in C++ code.

drive.png was unmentioned in the grd file. I added IDR_FILE_MANAGER_IMG_FILETYPE_DRIVE. Some uses of the images in CSS/JS use only the 1x versions. I left these as-is.


BUG=138965
TEST=Look at file manager and chrome://downloads in Linux chromeos build with --force-device-scale-factor=[12]


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

git-svn-id: http://src.chromium.org/svn/trunk/src/chrome/browser@157013 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
  • Loading branch information...
commit 41dafbdd764a350c1c2f997c0aa5ebdbc0d971e9 1 parent 4ca3612
benrg@chromium.org authored
Showing with 62 additions and 103 deletions.
  1. +10 −0 extensions/extension_service.cc
  2. +1 −1  icon_loader_chromeos.cc
  3. +0 −54 resources/component_extension_resources.grd
  4. +4 −2 resources/file_manager/css/action_choice.css
  5. +42 −42 resources/file_manager/css/file_types.css
  6. BIN  resources/file_manager/images/files/file_types/2x/archive.png
  7. BIN  resources/file_manager/images/files/file_types/2x/audio.png
  8. BIN  resources/file_manager/images/files/file_types/2x/chart.png
  9. BIN  resources/file_manager/images/files/file_types/2x/drive.png
  10. BIN  resources/file_manager/images/files/file_types/2x/excel.png
  11. BIN  resources/file_manager/images/files/file_types/2x/folder.png
  12. BIN  resources/file_manager/images/files/file_types/2x/form.png
  13. BIN  resources/file_manager/images/files/file_types/2x/gdoc.png
  14. BIN  resources/file_manager/images/files/file_types/2x/gdraw.png
  15. BIN  resources/file_manager/images/files/file_types/2x/generic.png
  16. BIN  resources/file_manager/images/files/file_types/2x/glink.png
  17. BIN  resources/file_manager/images/files/file_types/2x/gsheet.png
  18. BIN  resources/file_manager/images/files/file_types/2x/gslides.png
  19. BIN  resources/file_manager/images/files/file_types/2x/gtable.png
  20. BIN  resources/file_manager/images/files/file_types/2x/image.png
  21. BIN  resources/file_manager/images/files/file_types/2x/pdf.png
  22. BIN  resources/file_manager/images/files/file_types/2x/ppt.png
  23. BIN  resources/file_manager/images/files/file_types/2x/script.png
  24. BIN  resources/file_manager/images/files/file_types/2x/sites.png
  25. BIN  resources/file_manager/images/files/file_types/2x/video.png
  26. BIN  resources/file_manager/images/files/file_types/2x/word.png
  27. BIN  resources/file_manager/images/files/file_types/archive.png
  28. BIN  resources/file_manager/images/files/file_types/audio.png
  29. BIN  resources/file_manager/images/files/file_types/chart.png
  30. BIN  resources/file_manager/images/files/file_types/drive.png
  31. BIN  resources/file_manager/images/files/file_types/excel.png
  32. BIN  resources/file_manager/images/files/file_types/folder.png
  33. BIN  resources/file_manager/images/files/file_types/form.png
  34. BIN  resources/file_manager/images/files/file_types/gdoc.png
  35. BIN  resources/file_manager/images/files/file_types/gdraw.png
  36. BIN  resources/file_manager/images/files/file_types/generic.png
  37. BIN  resources/file_manager/images/files/file_types/glink.png
  38. BIN  resources/file_manager/images/files/file_types/gsheet.png
  39. BIN  resources/file_manager/images/files/file_types/gslides.png
  40. BIN  resources/file_manager/images/files/file_types/gtable.png
  41. BIN  resources/file_manager/images/files/file_types/image.png
  42. BIN  resources/file_manager/images/files/file_types/pdf.png
  43. BIN  resources/file_manager/images/files/file_types/ppt.png
  44. BIN  resources/file_manager/images/files/file_types/script.png
  45. BIN  resources/file_manager/images/files/file_types/sites.png
  46. BIN  resources/file_manager/images/files/file_types/video.png
  47. BIN  resources/file_manager/images/files/file_types/word.png
  48. BIN  resources/file_manager/images/files/thumbnails/2x/audio.png
  49. BIN  resources/file_manager/images/files/thumbnails/2x/folder.png
  50. BIN  resources/file_manager/images/files/thumbnails/2x/generic.png
  51. BIN  resources/file_manager/images/files/thumbnails/2x/image.png
  52. BIN  resources/file_manager/images/files/thumbnails/2x/video.png
  53. BIN  resources/file_manager/images/files/thumbnails/audio.png
  54. BIN  resources/file_manager/images/files/thumbnails/folder.png
  55. BIN  resources/file_manager/images/files/thumbnails/generic.png
  56. BIN  resources/file_manager/images/files/thumbnails/image.png
  57. BIN  resources/file_manager/images/files/thumbnails/video.png
  58. +2 −2 resources/file_manager/js/mock_chrome.js
  59. +2 −1  resources/file_manager/manifest.json
  60. +1 −1  resources/file_manager/video_player.html
View
10 extensions/extension_service.cc
@@ -83,6 +83,7 @@
#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
#include "chrome/browser/ui/webui/favicon_source.h"
#include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
+#include "chrome/browser/ui/webui/theme_source.h"
#include "chrome/common/child_process_logging.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_paths.h"
@@ -1019,6 +1020,15 @@ void ExtensionService::NotifyExtensionLoaded(const Extension* extension) {
FaviconSource::FAVICON);
ChromeURLDataManager::AddDataSource(profile_, favicon_source);
}
+
+#if !defined(OS_ANDROID)
+ // Same for chrome://theme/ resources.
+ if (extension->HasHostPermission(GURL(chrome::kChromeUIThemeURL))) {
+ ThemeSource* theme_source = new ThemeSource(profile_);
+ ChromeURLDataManager::AddDataSource(profile_, theme_source);
+ }
+#endif
+
// Same for chrome://thumb/ resources.
if (extension->HasHostPermission(GURL(chrome::kChromeUIThumbnailURL))) {
ThumbnailSource* thumbnail_source = new ThumbnailSource(profile_);
View
2  icon_loader_chromeos.cc
@@ -13,7 +13,7 @@
#include "base/memory/ref_counted_memory.h"
#include "base/message_loop.h"
#include "chrome/browser/icon_loader.h"
-#include "grit/component_extension_resources.h"
+#include "grit/theme_resources.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
View
54 resources/component_extension_resources.grd
@@ -79,60 +79,6 @@
<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_IMG_FILETYPE_ARCHIVE" file="file_manager/images/files/file_types/archive.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_AUDIO" file="file_manager/images/files/file_types/audio.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_CHART" file="file_manager/images/files/file_types/chart.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_EXCEL" file="file_manager/images/files/file_types/excel.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_FOLDER" file="file_manager/images/files/file_types/folder.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_FORM" file="file_manager/images/files/file_types/form.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_GDOC" file="file_manager/images/files/file_types/gdoc.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_GDRAW" file="file_manager/images/files/file_types/gdraw.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_GENERIC" file="file_manager/images/files/file_types/generic.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_GLINK" file="file_manager/images/files/file_types/glink.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_GSHEET" file="file_manager/images/files/file_types/gsheet.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_GSLIDES" file="file_manager/images/files/file_types/gslides.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_GTABLE" file="file_manager/images/files/file_types/gtable.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_IMAGE" file="file_manager/images/files/file_types/image.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_PDF" file="file_manager/images/files/file_types/pdf.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_PPT" file="file_manager/images/files/file_types/ppt.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_SCRIPT" file="file_manager/images/files/file_types/script.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_SITES" file="file_manager/images/files/file_types/sites.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_VIDEO" file="file_manager/images/files/file_types/video.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_WORD" file="file_manager/images/files/file_types/word.png" type="BINDATA" />
-
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_ARCHIVE" file="file_manager/images/files/file_types/2x/archive.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_AUDIO" file="file_manager/images/files/file_types/2x/audio.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_CHART" file="file_manager/images/files/file_types/2x/chart.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_EXCEL" file="file_manager/images/files/file_types/2x/excel.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_FOLDER" file="file_manager/images/files/file_types/2x/folder.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_FORM" file="file_manager/images/files/file_types/2x/form.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_GDOC" file="file_manager/images/files/file_types/2x/gdoc.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_GDRAW" file="file_manager/images/files/file_types/2x/gdraw.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_GENERIC" file="file_manager/images/files/file_types/2x/generic.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_GLINK" file="file_manager/images/files/file_types/2x/glink.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_GSHEET" file="file_manager/images/files/file_types/2x/gsheet.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_GSLIDES" file="file_manager/images/files/file_types/2x/gslides.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_GTABLE" file="file_manager/images/files/file_types/2x/gtable.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_IMAGE" file="file_manager/images/files/file_types/2x/image.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_PDF" file="file_manager/images/files/file_types/2x/pdf.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_PPT" file="file_manager/images/files/file_types/2x/ppt.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_SCRIPT" file="file_manager/images/files/file_types/2x/script.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_SITES" file="file_manager/images/files/file_types/2x/sites.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_VIDEO" file="file_manager/images/files/file_types/2x/video.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_2X_WORD" file="file_manager/images/files/file_types/2x/word.png" type="BINDATA" />
-
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_AUDIO" file="file_manager/images/files/thumbnails/audio.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_FOLDER" file="file_manager/images/files/thumbnails/folder.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_GENERIC" file="file_manager/images/files/thumbnails/generic.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_IMAGE" file="file_manager/images/files/thumbnails/image.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_VIDEO" file="file_manager/images/files/thumbnails/video.png" type="BINDATA" />
-
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_2X_AUDIO" file="file_manager/images/files/thumbnails/2x/audio.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_2X_FOLDER" file="file_manager/images/files/thumbnails/2x/folder.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_2X_GENERIC" file="file_manager/images/files/thumbnails/2x/generic.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_2X_IMAGE" file="file_manager/images/files/thumbnails/2x/image.png" type="BINDATA" />
- <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_2X_VIDEO" file="file_manager/images/files/thumbnails/2x/video.png" type="BINDATA" />
-
<!-- Resources used for non-flattened HTML files. -->
<include name="IDR_FILE_MANAGER_GDRIVE_WELCOME_STYLE" file="file_manager/css/gdrive_welcome.css" type="BINDATA" />
<include name="IDR_FILE_MANAGER_IMG_UI_GDRIVE_WELCOME_BACKGROUND" file="shared/images/clouds.png" type="BINDATA" />
View
6 resources/file_manager/css/action_choice.css
@@ -90,13 +90,15 @@
.choices label[for=import-photos-to-drive] {
/* TODO(dgozman): change to the right one */
- background: url(../images/files/file_types/gsheet.png) no-repeat;
+ background:
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_GSHEET') no-repeat;
padding-left: 20px;
}
.choices label[for=view-files] {
/* TODO(dgozman): change to the right one */
- background: url(../images/files/file_types/gdoc.png) no-repeat;
+ background:
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_GDOC') no-repeat;
padding-left: 20px;
}
View
84 resources/file_manager/css/file_types.css
@@ -5,133 +5,133 @@
/* Small icons for file types, used in lists and menus. */
*[file-type-icon] {
background-image: -webkit-image-set(
- url('../images/files/file_types/generic.png') 1x,
- url('../images/files/file_types/2x/generic.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_GENERIC') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_GENERIC@2x') 2x);
background-position: center;
background-repeat: no-repeat;
}
*[file-type-icon='archive'] {
background-image: -webkit-image-set(
- url('../images/files/file_types/archive.png') 1x,
- url('../images/files/file_types/2x/archive.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_ARCHIVE') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_ARCHIVE@2x') 2x);
}
*[file-type-icon='audio'] {
background-image: -webkit-image-set(
- url('../images/files/file_types/audio.png') 1x,
- url('../images/files/file_types/2x/audio.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_AUDIO') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_AUDIO@2x') 2x);
}
*[file-type-icon='drive'] {
background-image: -webkit-image-set(
- url('../images/files/file_types/drive.png') 1x,
- url('../images/files/file_types/2x/drive.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_DRIVE') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_DRIVE@2x') 2x);
}
*[file-type-icon='excel'] {
background-image: -webkit-image-set(
- url('../images/files/file_types/excel.png') 1x,
- url('../images/files/file_types/2x/excel.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_EXCEL') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_EXCEL@2x') 2x);
}
*[file-type-icon='folder'] {
background-image: -webkit-image-set(
- url('../images/files/file_types/folder.png') 1x,
- url('../images/files/file_types/2x/folder.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_FOLDER') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_FOLDER@2x') 2x);
}
*[file-type-icon='gdoc'] {
background-image: -webkit-image-set(
- url('../images/files/file_types/gdoc.png') 1x,
- url('../images/files/file_types/2x/gdoc.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_GDOC') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_GDOC@2x') 2x);
}
*[file-type-icon='gdraw'] {
background-image: -webkit-image-set(
- url('../images/files/file_types/gdraw.png') 1x,
- url('../images/files/file_types/2x/gdraw.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_GDRAW') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_GDRAW@2x') 2x);
}
*[file-type-icon='gsheet'] {
background-image: -webkit-image-set(
- url('../images/files/file_types/gsheet.png') 1x,
- url('../images/files/file_types/2x/gsheet.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_GSHEET') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_GSHEET@2x') 2x);
}
*[file-type-icon='gslides'] {
background-image: -webkit-image-set(
- url('../images/files/file_types/gslides.png') 1x,
- url('../images/files/file_types/2x/gslides.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_GSLIDES') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_GSLIDES@2x') 2x);
}
*[file-type-icon='gtable'] {
background-image: -webkit-image-set(
- url('../images/files/file_types/gtable.png') 1x,
- url('../images/files/file_types/2x/gtable.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_GTABLE') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_GTABLE@2x') 2x);
}
*[file-type-icon='image'] {
background-image: -webkit-image-set(
- url('../images/files/file_types/image.png') 1x,
- url('../images/files/file_types/2x/image.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_IMAGE') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_IMAGE@2x') 2x);
}
*[file-type-icon='pdf'] {
background-image: -webkit-image-set(
- url('../images/files/file_types/pdf.png') 1x,
- url('../images/files/file_types/2x/pdf.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_PDF') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_PDF@2x') 2x);
}
*[file-type-icon='ppt'] {
background-image: -webkit-image-set(
- url('../images/files/file_types/ppt.png') 1x,
- url('../images/files/file_types/2x/ppt.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_PPT') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_PPT@2x') 2x);
}
*[file-type-icon='video'] {
background-image: -webkit-image-set(
- url('../images/files/file_types/video.png') 1x,
- url('../images/files/file_types/2x/video.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_VIDEO') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_VIDEO@2x') 2x);
}
*[file-type-icon='word'] {
background-image: -webkit-image-set(
- url('../images/files/file_types/word.png') 1x,
- url('../images/files/file_types/2x/word.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_WORD') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_WORD@2x') 2x);
}
/* Large generic thumbnails, used when a file does not have a thumbnail. */
*[generic-thumbnail] {
background-image: -webkit-image-set(
- url('../images/files/thumbnails/generic.png') 1x,
- url('../images/files/thumbnails/2x/generic.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_GENERIC') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_GENERIC@2x') 2x);
background-position: center center;
background-repeat: no-repeat;
}
*[generic-thumbnail='audio'] {
background-image: -webkit-image-set(
- url('../images/files/thumbnails/audio.png') 1x,
- url('../images/files/thumbnails/2x/audio.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_AUDIO') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_AUDIO@2x') 2x);
}
*[generic-thumbnail='folder'] {
background-image: -webkit-image-set(
- url('../images/files/thumbnails/folder.png') 1x,
- url('../images/files/thumbnails/2x/folder.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_FOLDER') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_FOLDER@2x') 2x);
}
*[generic-thumbnail='image'] {
background-image: -webkit-image-set(
- url('../images/files/thumbnails/image.png') 1x,
- url('../images/files/thumbnails/2x/image.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_IMAGE') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_IMAGE@2x') 2x);
}
*[generic-thumbnail='video'] {
background-image: -webkit-image-set(
- url('../images/files/thumbnails/video.png') 1x,
- url('../images/files/thumbnails/2x/video.png') 2x);
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_VIDEO') 1x,
+ url('chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_VIDEO@2x') 2x);
}
/* Icons for volume types. */
View
BIN  resources/file_manager/images/files/file_types/2x/archive.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/audio.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/chart.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/drive.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/excel.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/folder.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/form.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/gdoc.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/gdraw.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/generic.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/glink.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/gsheet.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/gslides.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/gtable.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/image.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/pdf.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/ppt.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/script.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/sites.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/video.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/2x/word.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/archive.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/audio.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/chart.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/drive.png
Deleted file not rendered
View
BIN  resources/file_manager/images/files/file_types/excel.png
Diff not rendered
View
BIN  resources/file_manager/images/files/file_types/folder.png
Diff not rendered
View
BIN  resources/file_manager/images/files/file_types/form.png
Diff not rendered
View
BIN  resources/file_manager/images/files/file_types/gdoc.png
Diff not rendered
View
BIN  resources/file_manager/images/files/file_types/gdraw.png
Diff not rendered
View
BIN  resources/file_manager/images/files/file_types/generic.png
Diff not rendered
View
BIN  resources/file_manager/images/files/file_types/glink.png
Diff not rendered
View
BIN  resources/file_manager/images/files/file_types/gsheet.png
Diff not rendered
View
BIN  resources/file_manager/images/files/file_types/gslides.png
Diff not rendered
View
BIN  resources/file_manager/images/files/file_types/gtable.png
Diff not rendered
View
BIN  resources/file_manager/images/files/file_types/image.png
Diff not rendered
View
BIN  resources/file_manager/images/files/file_types/pdf.png
Diff not rendered
View
BIN  resources/file_manager/images/files/file_types/ppt.png
Diff not rendered
View
BIN  resources/file_manager/images/files/file_types/script.png
Diff not rendered
View
BIN  resources/file_manager/images/files/file_types/sites.png
Diff not rendered
View
BIN  resources/file_manager/images/files/file_types/video.png
Diff not rendered
View
BIN  resources/file_manager/images/files/file_types/word.png
Diff not rendered
View
BIN  resources/file_manager/images/files/thumbnails/2x/audio.png
Diff not rendered
View
BIN  resources/file_manager/images/files/thumbnails/2x/folder.png
Diff not rendered
View
BIN  resources/file_manager/images/files/thumbnails/2x/generic.png
Diff not rendered
View
BIN  resources/file_manager/images/files/thumbnails/2x/image.png
Diff not rendered
View
BIN  resources/file_manager/images/files/thumbnails/2x/video.png
Diff not rendered
View
BIN  resources/file_manager/images/files/thumbnails/audio.png
Diff not rendered
View
BIN  resources/file_manager/images/files/thumbnails/folder.png
Diff not rendered
View
BIN  resources/file_manager/images/files/thumbnails/generic.png
Diff not rendered
View
BIN  resources/file_manager/images/files/thumbnails/image.png
Diff not rendered
View
BIN  resources/file_manager/images/files/thumbnails/video.png
Diff not rendered
View
4 resources/file_manager/js/mock_chrome.js
@@ -159,13 +159,13 @@ chrome.fileBrowserPrivate = {
taskId: 'fake-extension-id|fake-item',
title: 'External action',
regexp: /\.(bmp|gif|jpe?g|png|webp|3gp|avi|m4v|mov|mp4|mpeg4?|mpg4?|ogm|ogv|ogx|webm)$/i,
- iconUrl: 'images/files/file_types/generic.png'
+ iconUrl: 'chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_GENERIC'
},
{
taskId: 'fake-extension-id|upload',
title: 'Upload video',
regexp: /\.(3gp|avi|m4v|mov|mp4|mpeg4?|mpg4?|ogm|ogv|ogx|webm)$/i,
- iconUrl: 'images/files/file_types/video.png'
+ iconUrl: 'chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_VIDEO'
},
{
taskId: extensionId + '|view-in-browser',
View
3  resources/file_manager/manifest.json
@@ -17,12 +17,13 @@
"unlimitedStorage",
"chrome://extension-icon/",
"chrome://resources/",
+ "chrome://theme/",
"tabs",
"clipboardWrite",
"clipboardRead",
"https://*.googleusercontent.com/"
],
- "content_security_policy": "default-src 'none'; script-src 'self'; style-src 'self' 'unsafe-inline'; frame-src 'self' about:; img-src 'self' chrome://resources data: https://docs.google.com https://*.googleusercontent.com chrome://extension-icon; media-src 'self' https://*.googleusercontent.com;",
+ "content_security_policy": "default-src 'none'; script-src 'self'; style-src 'self' 'unsafe-inline'; frame-src 'self' about:; img-src 'self' chrome://resources chrome://theme data: https://docs.google.com https://*.googleusercontent.com chrome://extension-icon; media-src 'self' https://*.googleusercontent.com;",
"app": {
"launch": {
"container": "panel",
View
2  resources/file_manager/video_player.html
@@ -10,7 +10,7 @@
-- string. Until then, use an invisible non-whitespace character.
-->
<title>&#xFEFF;</title>
- <link rel="icon" type="image/png" href="images/files/file_types/video.png">
+ <link rel="icon" type="image/png" href="chrome://theme/IDR_FILE_MANAGER_IMG_FILETYPE_VIDEO">
<link rel="stylesheet" type="text/css" href="css/media_controls.css">
<link rel="stylesheet" type="text/css" href="css/video_player.css">
Please sign in to comment.
Something went wrong with that request. Please try again.