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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 216793013: Revert 260245 "Revert 260198 "[VideoPlayer] Browser tests for ne..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 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 | « trunk/src/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc ('k') | trunk/src/chrome/browser/resources/video_player/js/background.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" />
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 <include name="IDR_FEEDBACK_ICON_64" file="feedback/images/icon64.png" typ e="BINDATA" /> 68 <include name="IDR_FEEDBACK_ICON_64" file="feedback/images/icon64.png" typ e="BINDATA" />
69 <if expr="chromeos"> 69 <if expr="chromeos">
70 <!-- App pages and scripts. --> 70 <!-- App pages and scripts. -->
71 <include name="IDR_FILE_MANAGER_MAIN" file="file_manager/main.html" flat tenhtml="true" allowexternalscript="true" type="BINDATA" /> 71 <include name="IDR_FILE_MANAGER_MAIN" file="file_manager/main.html" flat tenhtml="true" allowexternalscript="true" type="BINDATA" />
72 <include name="IDR_FILE_MANAGER_MAIN_JS" file="file_manager/foreground/j s/main_scripts.js" flattenhtml="true" type="BINDATA" /> 72 <include name="IDR_FILE_MANAGER_MAIN_JS" file="file_manager/foreground/j s/main_scripts.js" flattenhtml="true" type="BINDATA" />
73 <include name="IDR_FILE_MANAGER_BKGND_JS" file="file_manager/background/ js/background.js" type="BINDATA" /> 73 <include name="IDR_FILE_MANAGER_BKGND_JS" file="file_manager/background/ js/background.js" type="BINDATA" />
74 74
75 <include name="IDR_VIDEO_PLAYER" file="video_player/video_player.html" a llowexternalscript="true" flattenhtml="true" type="BINDATA" /> 75 <include name="IDR_VIDEO_PLAYER" file="video_player/video_player.html" a llowexternalscript="true" flattenhtml="true" type="BINDATA" />
76 <include name="IDR_VIDEO_PLAYER_JS" file="video_player/js/video_player_s cripts.js" flattenhtml="true" type="BINDATA" /> 76 <include name="IDR_VIDEO_PLAYER_JS" file="video_player/js/video_player_s cripts.js" flattenhtml="true" type="BINDATA" />
77 <include name="IDR_VIDEO_PLAYER_BKGND_JS" file="video_player/js/backgrou nd.js" flattenhtml="true" type="BINDATA" /> 77 <include name="IDR_VIDEO_PLAYER_BKGND_JS" file="video_player/js/backgrou nd.js" flattenhtml="true" type="BINDATA" />
78 <include name="IDR_VIDEO_PLAYER_TEST_UTIL_JS" file="video_player/js/test _util.js" flattenhtml="false" type="BINDATA" />
79 <include name="IDR_VIDEO_PLAYER_ERROR_UTIL_JS" file="video_player/js/err or_util.js" flattenhtml="false" type="BINDATA" />
78 <include name="IDR_VIDEO_PLAYER_ICON_16" file="video_player/images/100/i con.png" type="BINDATA" /> 80 <include name="IDR_VIDEO_PLAYER_ICON_16" file="video_player/images/100/i con.png" type="BINDATA" />
79 <include name="IDR_VIDEO_PLAYER_ICON_32" file="video_player/images/200/i con.png" type="BINDATA" /> 81 <include name="IDR_VIDEO_PLAYER_ICON_32" file="video_player/images/200/i con.png" type="BINDATA" />
80 <include name="IDR_FILE_MANAGER_AUDIO_PLAYER" file="file_manager/audio_p layer.html" allowexternalscript="true" flattenhtml="true" type="BINDATA" /> 82 <include name="IDR_FILE_MANAGER_AUDIO_PLAYER" file="file_manager/audio_p layer.html" allowexternalscript="true" flattenhtml="true" type="BINDATA" />
81 <include name="IDR_FILE_MANAGER_AUDIO_PLAYER_SCRIPTS_JS" file="file_mana ger/audio_player/js/audio_player_scripts.js" flattenhtml="true" type="BINDATA" / > 83 <include name="IDR_FILE_MANAGER_AUDIO_PLAYER_SCRIPTS_JS" file="file_mana ger/audio_player/js/audio_player_scripts.js" flattenhtml="true" type="BINDATA" / >
82 84
83 <include name="IDR_FILE_MANAGER_GALLERY" file="file_manager/gallery.html " allowexternalscript="true" flattenhtml="true" type="BINDATA" /> 85 <include name="IDR_FILE_MANAGER_GALLERY" file="file_manager/gallery.html " allowexternalscript="true" flattenhtml="true" type="BINDATA" />
84 <include name="IDR_FILE_MANAGER_GALLERY_JS" file="file_manager/foregroun d/js/photo/gallery_scripts.js" flattenhtml="true" type="BINDATA" /> 86 <include name="IDR_FILE_MANAGER_GALLERY_JS" file="file_manager/foregroun d/js/photo/gallery_scripts.js" flattenhtml="true" type="BINDATA" />
85 87
86 <!-- Scripts working in background page. --> 88 <!-- Scripts working in background page. -->
87 <include name="IDR_FILE_MANAGER_ASYNC_UTIL_JS" file="file_manager/common /js/async_util.js" flattenhtml="false" type="BINDATA" /> 89 <include name="IDR_FILE_MANAGER_ASYNC_UTIL_JS" file="file_manager/common /js/async_util.js" flattenhtml="false" type="BINDATA" />
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 <include name="IDR_PDF_BUTTON_HIGH_1" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_fit_page.png" type="BINDATA" /> 208 <include name="IDR_PDF_BUTTON_HIGH_1" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_fit_page.png" type="BINDATA" />
207 <include name="IDR_PDF_BUTTON_HIGH_2" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_fit_width.png" type="BINDATA" /> 209 <include name="IDR_PDF_BUTTON_HIGH_2" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_fit_width.png" type="BINDATA" />
208 <include name="IDR_PDF_BUTTON_HIGH_3" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_zoom_out.png" type="BINDATA" /> 210 <include name="IDR_PDF_BUTTON_HIGH_3" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_zoom_out.png" type="BINDATA" />
209 <include name="IDR_PDF_BUTTON_HIGH_4" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_zoom_in.png" type="BINDATA" /> 211 <include name="IDR_PDF_BUTTON_HIGH_4" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_zoom_in.png" type="BINDATA" />
210 <include name="IDR_PDF_BUTTON_HIGH_5" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_save.png" type="BINDATA" /> 212 <include name="IDR_PDF_BUTTON_HIGH_5" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_save.png" type="BINDATA" />
211 <include name="IDR_PDF_BUTTON_HIGH_6" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_print.png" type="BINDATA" /> 213 <include name="IDR_PDF_BUTTON_HIGH_6" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_print.png" type="BINDATA" />
212 </if> 214 </if>
213 </includes> 215 </includes>
214 </release> 216 </release>
215 </grit> 217 </grit>
OLDNEW
« no previous file with comments | « trunk/src/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc ('k') | trunk/src/chrome/browser/resources/video_player/js/background.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698