Use same icon set to be consistent in Files.app and Chrome.
Make Files.app and Chrome refer same icon sets and remove duplicate files.
Now those icon files are not under file_manager folder, changed their id from IDR_FILE_MANAGER_IMG_FILETYPE_* to IDR_FILETYPE_*
BUG=343127
TEST=ran browser_test on Release/Debug.
manually verified that each filetype icons appears correctly.
[email protected], [email protected], [email protected]
Review URL: https://codereview.chromium.org/209433005
Patch from Naoki Fukino <[email protected]>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261396 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/icon_loader_chromeos.cc b/chrome/browser/icon_loader_chromeos.cc
index 692360fa..9bfb004 100644
--- a/chrome/browser/icon_loader_chromeos.cc
+++ b/chrome/browser/icon_loader_chromeos.cc
@@ -54,31 +54,31 @@
};
const IdrBySize kAudioIdrs = {
- IDR_FILE_MANAGER_IMG_FILETYPE_AUDIO,
- IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_AUDIO,
- IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_AUDIO
+ IDR_FILETYPE_AUDIO,
+ IDR_FILETYPE_LARGE_AUDIO,
+ IDR_FILETYPE_LARGE_AUDIO
};
const IdrBySize kGenericIdrs = {
- IDR_FILE_MANAGER_IMG_FILETYPE_GENERIC,
- IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_GENERIC,
- IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_GENERIC
+ IDR_FILETYPE_GENERIC,
+ IDR_FILETYPE_LARGE_GENERIC,
+ IDR_FILETYPE_LARGE_GENERIC
};
const IdrBySize kImageIdrs = {
- IDR_FILE_MANAGER_IMG_FILETYPE_IMAGE,
- IDR_FILE_MANAGER_IMG_FILETYPE_IMAGE,
- IDR_FILE_MANAGER_IMG_FILETYPE_IMAGE
+ IDR_FILETYPE_IMAGE,
+ IDR_FILETYPE_IMAGE,
+ IDR_FILETYPE_IMAGE
};
#if defined(USE_PROPRIETARY_CODECS)
const IdrBySize kPdfIdrs = {
- IDR_FILE_MANAGER_IMG_FILETYPE_PDF,
- IDR_FILE_MANAGER_IMG_FILETYPE_PDF,
- IDR_FILE_MANAGER_IMG_FILETYPE_PDF
+ IDR_FILETYPE_PDF,
+ IDR_FILETYPE_PDF,
+ IDR_FILETYPE_PDF
};
#endif
const IdrBySize kVideoIdrs = {
- IDR_FILE_MANAGER_IMG_FILETYPE_VIDEO,
- IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_VIDEO,
- IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_VIDEO
+ IDR_FILETYPE_VIDEO,
+ IDR_FILETYPE_LARGE_VIDEO,
+ IDR_FILETYPE_LARGE_VIDEO
};
IconMapper::IconMapper() {
