Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(191)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7067020: Moving mediaplayer to the chrome filebrowser. Observable behaviour should not change. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolved conflicts. Created 9 years, 6 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/file_manager_util.cc ('k') | chrome/browser/resources/file_manager/js/file_manager.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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" />
11 <output filename="component_extension_resources.pak" type="data_package" /> 11 <output filename="component_extension_resources.pak" type="data_package" />
12 </outputs> 12 </outputs>
13 <release seq="1"> 13 <release seq="1">
14 <includes> 14 <includes>
15 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_MANAGER_RECENT" file="bookmar k_manager/images/bookmark_manager_recent.png" type="BINDATA" /> 15 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_MANAGER_RECENT" file="bookmar k_manager/images/bookmark_manager_recent.png" type="BINDATA" />
16 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_MANAGER_SEARCH" file="bookmar k_manager/images/bookmark_manager_search.png" type="BINDATA" /> 16 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_MANAGER_SEARCH" file="bookmar k_manager/images/bookmark_manager_search.png" type="BINDATA" />
17 <include name="IDR_BOOKMARK_MANAGER_MAIN" file="bookmark_manager/main.html " flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 17 <include name="IDR_BOOKMARK_MANAGER_MAIN" file="bookmark_manager/main.html " flattenhtml="true" allowexternalscript="true" type="BINDATA" />
18 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_MAIN_JS" file="bookmark_manag er/js/main.js" type="BINDATA" /> 18 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_MAIN_JS" file="bookmark_manag er/js/main.js" type="BINDATA" />
19 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_BMM_LIST_JS" file="bookmark_m anager/js/bmm/bookmark_list.js" type="BINDATA" /> 19 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_BMM_LIST_JS" file="bookmark_m anager/js/bmm/bookmark_list.js" type="BINDATA" />
20 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_BMM_TREE_JS" file="bookmark_m anager/js/bmm/bookmark_tree.js" type="BINDATA" /> 20 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_BMM_TREE_JS" file="bookmark_m anager/js/bmm/bookmark_tree.js" type="BINDATA" />
21 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_BMM_JS" file="bookmark_manage r/js/bmm.js" type="BINDATA" /> 21 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_BMM_JS" file="bookmark_manage r/js/bmm.js" type="BINDATA" />
22 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_CSS_JS" file="bookmark_manage r/css/bmm.css.js" type="BINDATA" /> 22 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_CSS_JS" file="bookmark_manage r/css/bmm.css.js" type="BINDATA" />
23 23
24 <if expr="pp_ifdef('file_manager_extension')"> 24 <if expr="pp_ifdef('file_manager_extension')">
25 <include name="IDR_FILE_MANAGER_MAIN" file="file_manager/main.html" flat tenhtml="true" type="BINDATA" /> 25 <include name="IDR_FILE_MANAGER_MAIN" file="file_manager/main.html" flat tenhtml="true" type="BINDATA" />
26 <include name="IDR_FILE_MANAGER_SLIDESHOW" file="file_manager/slideshow. html" flattenhtml="true" type="BINDATA" /> 26 <include name="IDR_FILE_MANAGER_SLIDESHOW" file="file_manager/slideshow. html" flattenhtml="true" type="BINDATA" />
27 <include name="IDR_FILE_MANAGER_MEDIAPLAYER" file="file_manager/mediapla yer.html" flattenhtml="true" type="BINDATA" />
28 <include name="IDR_FILE_MANAGER_PLAYLIST" file="file_manager/playlist.ht ml" flattenhtml="true" type="BINDATA" />
27 <include name="IDR_FILE_MANAGER_EXIF_READER" file="file_manager/js/exif_ reader.js" type="BINDATA" /> 29 <include name="IDR_FILE_MANAGER_EXIF_READER" file="file_manager/js/exif_ reader.js" type="BINDATA" />
28 <include name="IDR_FILE_MANAGER_PREVIEW_ICON" file="file_manager/images/ icon_preview_16x16.png" type="BINDATA" /> 30 <include name="IDR_FILE_MANAGER_PREVIEW_ICON" file="file_manager/images/ icon_preview_16x16.png" type="BINDATA" />
29 <include name="IDR_FILE_MANAGER_MEDIA_PLAY_ICON" file="file_manager/imag es/icon_play_16x16.png" type="BINDATA" /> 31 <include name="IDR_FILE_MANAGER_MEDIA_PLAY_ICON" file="file_manager/imag es/icon_play_16x16.png" type="BINDATA" />
30 <include name="IDR_FILE_MANAGER_MEDIA_ENQUEUE_ICON" file="file_manager/i mages/icon_add_to_queue_16x16.png" type="BINDATA" /> 32 <include name="IDR_FILE_MANAGER_MEDIA_ENQUEUE_ICON" file="file_manager/i mages/icon_add_to_queue_16x16.png" type="BINDATA" />
31 33
32 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_AUDIO" file="file_manager/i mages/filetype_audio.png" type="BINDATA" /> 34 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_AUDIO" file="file_manager/i mages/filetype_audio.png" type="BINDATA" />
33 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_DOC" file="file_manager/ima ges/filetype_doc.png" type="BINDATA" /> 35 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_DOC" file="file_manager/ima ges/filetype_doc.png" type="BINDATA" />
34 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_FOLDER" file="file_manager/ images/filetype_folder.png" type="BINDATA" /> 36 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_FOLDER" file="file_manager/ images/filetype_folder.png" type="BINDATA" />
35 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_GENERIC" file="file_manager /images/filetype_generic.png" type="BINDATA" /> 37 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_GENERIC" file="file_manager /images/filetype_generic.png" type="BINDATA" />
36 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_HTML" file="file_manager/im ages/filetype_html.png" type="BINDATA" /> 38 <include name="IDR_FILE_MANAGER_IMG_FILETYPE_HTML" file="file_manager/im ages/filetype_html.png" type="BINDATA" />
(...skipping 13 matching lines...) Expand all
50 <include name="IDR_FILE_MANAGER_ICON_DETAIL_VIEW" file="file_manager/ima ges/icon-detail-view.png" type="BINDATA" /> 52 <include name="IDR_FILE_MANAGER_ICON_DETAIL_VIEW" file="file_manager/ima ges/icon-detail-view.png" type="BINDATA" />
51 <include name="IDR_FILE_MANAGER_ICON_THUMB_VIEW" file="file_manager/imag es/icon-thumb-view.png" type="BINDATA" /> 53 <include name="IDR_FILE_MANAGER_ICON_THUMB_VIEW" file="file_manager/imag es/icon-thumb-view.png" type="BINDATA" />
52 </if> 54 </if>
53 55
54 <if expr="pp_ifdef('touchui')"> 56 <if expr="pp_ifdef('touchui')">
55 <include name="IDR_KEYBOARD_INDEX" file="keyboard/index.html" flattenhtm l="true" type="BINDATA" /> 57 <include name="IDR_KEYBOARD_INDEX" file="keyboard/index.html" flattenhtm l="true" type="BINDATA" />
56 </if> 58 </if>
57 </includes> 59 </includes>
58 </release> 60 </release>
59 </grit> 61 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/extensions/file_manager_util.cc ('k') | chrome/browser/resources/file_manager/js/file_manager.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698