chrome/browser/resources/component_extension_resources.grd - Issue 7706028: This is UI side unreadable device support.

Side by Side Diff: chrome/browser/resources/component_extension_resources.grd

Issue 7706028: This is UI side unreadable device support. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: merging conflict Created 9 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/extensions/extension_file_browser_private_api.cc ('k') | chrome/browser/resources/file_manager/css/file_manager.css » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <?xml version="1.0" encoding="UTF-8"?>	1 <?xml version="1.0" encoding="UTF-8"?>

2 <!-- This comment is only here because changes to resources are not picked up	2 <!-- This comment is only here because changes to resources are not picked up

3 without changes to the corresponding grd file. -->	3 without changes to the corresponding grd file. -->

4 <grit latest_public_release="0" current_release="1">	4 <grit latest_public_release="0" current_release="1">

5 <outputs>	5 <outputs>

6 <output filename="grit/component_extension_resources.h" type="rc_header">	6 <output filename="grit/component_extension_resources.h" type="rc_header">

7 <emit emit_type='prepend'></emit>	7 <emit emit_type='prepend'></emit>

8 </output>	8 </output>

9 <output filename="grit/component_extension_resources_map.cc" type="resource_ file_map_source" />	9 <output filename="grit/component_extension_resources_map.cc" type="resource_ file_map_source" />

10 <output filename="grit/component_extension_resources_map.h" type="resource_m ap_header" />	10 <output filename="grit/component_extension_resources_map.h" type="resource_m ap_header" />

(...skipping 28 matching lines...) Expand all Loading...
39 <include name="IDR_FILE_MANAGER_SEQUENCE" file="file_manager/js/function _sequence.js" type="BINDATA" />	39 <include name="IDR_FILE_MANAGER_SEQUENCE" file="file_manager/js/function _sequence.js" type="BINDATA" />

40 <include name="IDR_FILE_MANAGER_ICON_16" file="file_manager/images/icon1 6.png" type="BINDATA" />	40 <include name="IDR_FILE_MANAGER_ICON_16" file="file_manager/images/icon1 6.png" type="BINDATA" />

41 <include name="IDR_FILE_MANAGER_ICON_128" file="file_manager/images/icon 128.png" type="BINDATA" />	41 <include name="IDR_FILE_MANAGER_ICON_128" file="file_manager/images/icon 128.png" type="BINDATA" />

42 <include name="IDR_FILE_MANAGER_PREVIEW_ICON" file="file_manager/images/ icon_preview_16x16.png" type="BINDATA" />	42 <include name="IDR_FILE_MANAGER_PREVIEW_ICON" file="file_manager/images/ icon_preview_16x16.png" type="BINDATA" />

43 <include name="IDR_FILE_MANAGER_MEDIA_PLAY_ICON" file="file_manager/imag es/icon_play_16x16.png" type="BINDATA" />	43 <include name="IDR_FILE_MANAGER_MEDIA_PLAY_ICON" file="file_manager/imag es/icon_play_16x16.png" type="BINDATA" />

44 <include name="IDR_FILE_MANAGER_MEDIA_ENQUEUE_ICON" file="file_manager/i mages/icon_add_to_queue_16x16.png" type="BINDATA" />	44 <include name="IDR_FILE_MANAGER_MEDIA_ENQUEUE_ICON" file="file_manager/i mages/icon_add_to_queue_16x16.png" type="BINDATA" />

45 <include name="IDR_FILE_MANAGER_ARCHIVE_MOUNT_ICON" file="file_manager/i mages/icon_mount_archive_16x16.png" type="BINDATA" />	45 <include name="IDR_FILE_MANAGER_ARCHIVE_MOUNT_ICON" file="file_manager/i mages/icon_mount_archive_16x16.png" type="BINDATA" />

46 <include name="IDR_FILE_MANAGER_ARCHIVE_UNMOUNT_ICON" file="file_manager /images/icon_unmount_archive_16x16.png" type="BINDATA" />	46 <include name="IDR_FILE_MANAGER_ARCHIVE_UNMOUNT_ICON" file="file_manager /images/icon_unmount_archive_16x16.png" type="BINDATA" />

47	47

48 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_AUDIO" file="file_manager/i mages/filetype_audio.png" type="BINDATA" />	48 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_AUDIO" file="file_manager/i mages/filetype_audio.png" type="BINDATA" />

	49 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_DEVICE" file="file_manager/ images/filetype_device.png" type="BINDATA" />

49 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_DOC" file="file_manager/ima ges/filetype_doc.png" type="BINDATA" />	50 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_DOC" file="file_manager/ima ges/filetype_doc.png" type="BINDATA" />

50 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_FOLDER" file="file_manager/ images/filetype_folder.png" type="BINDATA" />	51 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_FOLDER" file="file_manager/ images/filetype_folder.png" type="BINDATA" />

51 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_GENERIC" file="file_manager /images/filetype_generic.png" type="BINDATA" />	52 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_GENERIC" file="file_manager /images/filetype_generic.png" type="BINDATA" />

52 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_HTML" file="file_manager/im ages/filetype_html.png" type="BINDATA" />	53 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_HTML" file="file_manager/im ages/filetype_html.png" type="BINDATA" />

53 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_IMAGE" file="file_manager/i mages/filetype_image.png" type="BINDATA" />	54 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_IMAGE" file="file_manager/i mages/filetype_image.png" type="BINDATA" />

54 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_PDF" file="file_manager/ima ges/filetype_pdf.png" type="BINDATA" />	55 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_PDF" file="file_manager/ima ges/filetype_pdf.png" type="BINDATA" />

55 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_PRESENTATION" file="file_ma nager/images/filetype_presentation.png" type="BINDATA" />	56 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_PRESENTATION" file="file_ma nager/images/filetype_presentation.png" type="BINDATA" />

56 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_SPREADSHEET" file="file_man ager/images/filetype_spreadsheet.png" type="BINDATA" />	57 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_SPREADSHEET" file="file_man ager/images/filetype_spreadsheet.png" type="BINDATA" />

	58 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_UNREADABLE_DEVICE" file="fi le_manager/images/filetype_unreadable_device.png" type="BINDATA" />

57 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_TEXT" file="file_manager/im ages/filetype_text.png" type="BINDATA" />	59 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_TEXT" file="file_manager/im ages/filetype_text.png" type="BINDATA" />

58 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_VIDEO" file="file_manager/i mages/filetype_video.png" type="BINDATA" />	60 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_VIDEO" file="file_manager/i mages/filetype_video.png" type="BINDATA" />

59	61

60 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_AUDIO" file="file_man ager/images/filetype_large_audio.png" type="BINDATA" />	62 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_AUDIO" file="file_man ager/images/filetype_large_audio.png" type="BINDATA" />

61 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_FOLDER" file="file_ma nager/images/filetype_large_folder.png" type="BINDATA" />	63 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_FOLDER" file="file_ma nager/images/filetype_large_folder.png" type="BINDATA" />

62 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_GENERIC" file="file_m anager/images/filetype_large_generic.png" type="BINDATA" />	64 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_GENERIC" file="file_m anager/images/filetype_large_generic.png" type="BINDATA" />

63 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_GENERIC_MULTIPLE" fil e="file_manager/images/filetype_large_generic_multiple.png" type="BINDATA" />	65 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_GENERIC_MULTIPLE" fil e="file_manager/images/filetype_large_generic_multiple.png" type="BINDATA" />

64 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_VIDEO" file="file_man ager/images/filetype_large_video.png" type="BINDATA" />	66 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_VIDEO" file="file_man ager/images/filetype_large_video.png" type="BINDATA" />

65	67

66 <include name="IDR_FILE_MANAGER_ICON_DETAIL_VIEW" file="file_manager/ima ges/icon-detail-view.png" type="BINDATA" />	68 <include name="IDR_FILE_MANAGER_ICON_DETAIL_VIEW" file="file_manager/ima ges/icon-detail-view.png" type="BINDATA" />

67 <include name="IDR_FILE_MANAGER_ICON_THUMB_VIEW" file="file_manager/imag es/icon-thumb-view.png" type="BINDATA" />	69 <include name="IDR_FILE_MANAGER_ICON_THUMB_VIEW" file="file_manager/imag es/icon-thumb-view.png" type="BINDATA" />

68 <include name="IDR_FILE_MANAGER_WARNING_ICON" file="file_manager/images/ warning_icon_square_26x26.png" type="BINDATA"/>	70 <include name="IDR_FILE_MANAGER_WARNING_ICON" file="file_manager/images/ warning_icon_square_26x26.png" type="BINDATA"/>

69	71

70 <include name="IDR_FILE_MANAGER_BUTTON_ICON_COPY" file="file_manager/ima ges/button-icon-copy.png" type="BINDATA" />	72 <include name="IDR_FILE_MANAGER_BUTTON_ICON_COPY" file="file_manager/ima ges/button-icon-copy.png" type="BINDATA" />

71 <include name="IDR_FILE_MANAGER_BUTTON_ICON_PASTE" file="file_manager/im ages/button-icon-paste.png" type="BINDATA" />	73 <include name="IDR_FILE_MANAGER_BUTTON_ICON_PASTE" file="file_manager/im ages/button-icon-paste.png" type="BINDATA" />

72 </if>	74 </if>

73	75

74 <if expr="pp_ifdef('touchui')">	76 <if expr="pp_ifdef('touchui')">

75 <include name="IDR_KEYBOARD_INDEX" file="keyboard/index.html" flattenhtm l="true" type="BINDATA" />	77 <include name="IDR_KEYBOARD_INDEX" file="keyboard/index.html" flattenhtm l="true" type="BINDATA" />

76 </if>	78 </if>

77 </includes>	79 </includes>

78 </release>	80 </release>

79 </grit>	81 </grit>

OLD	NEW