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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10443024: Added chrome switch that lets tests override URL path, moved GAIA auth extension from CrOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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/resources/chromeos/login/screen_gaia_signin.js ('k') | chrome/browser/resources/gaia_auth/OWNERS » ('j') | chrome/browser/resources/gaia_auth/test/content.js » ('J')
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_BOOKMARK_MANAGER_SEARCH_RTL" file="boo kmark_manager/images/bookmark_manager_search_rtl.png" type="BINDATA" /> 17 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_MANAGER_SEARCH_RTL" file="boo kmark_manager/images/bookmark_manager_search_rtl.png" type="BINDATA" />
18 <include name="IDR_BOOKMARK_MANAGER_MAIN" file="bookmark_manager/main.html " flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 18 <include name="IDR_BOOKMARK_MANAGER_MAIN" file="bookmark_manager/main.html " flattenhtml="true" allowexternalscript="true" type="BINDATA" />
19 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_MAIN_JS" file="bookmark_manag er/js/main.js" type="BINDATA" /> 19 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_MAIN_JS" file="bookmark_manag er/js/main.js" type="BINDATA" />
20 <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_LIST_JS" file="bookmark_m anager/js/bmm/bookmark_list.js" type="BINDATA" />
21 <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_TREE_JS" file="bookmark_m anager/js/bmm/bookmark_tree.js" type="BINDATA" />
22 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_BMM_JS" file="bookmark_manage r/js/bmm.js" type="BINDATA" /> 22 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_BMM_JS" file="bookmark_manage r/js/bmm.js" type="BINDATA" />
23 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_CSS_JS" file="bookmark_manage r/css/bmm.css.js" type="BINDATA" /> 23 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_CSS_JS" file="bookmark_manage r/css/bmm.css.js" type="BINDATA" />
24 24 <if expr="pp_ifdef('chromeos')">
25 <include name="IDR_GAIA_AUTH_MAIN" file="gaia_auth/main.html" allowexter nalscript="true" type="BINDATA" />
26 <include name="IDR_GAIA_AUTH_MAIN_JS" file="gaia_auth/main.js" type="BIN DATA" />
27 <include name="IDR_GAIA_AUTH_MAIN_CSS" file="gaia_auth/main.css" type="B INDATA" />
28 <include name="IDR_GAIA_AUTH_OFFLINE" file="gaia_auth/offline.html" allo wexternalscript="true" type="BINDATA" />
29 <include name="IDR_GAIA_AUTH_OFFLINE_JS" file="gaia_auth/offline.js" typ e="BINDATA" />
30 <include name="IDR_GAIA_AUTH_OFFLINE_CSS" file="gaia_auth/offline.css" t ype="BINDATA" />
31 <include name="IDR_GAIA_AUTH_SUCCESS" file="gaia_auth/success.html" allo wexternalscript="true" type="BINDATA" />
32 <include name="IDR_GAIA_AUTH_SUCCESS_JS" file="gaia_auth/success.js" typ e="BINDATA" />
33 <include name="IDR_GAIA_AUTH_UTIL_JS" file="gaia_auth/util.js" type="BIN DATA" />
34 <include name="IDR_GAIA_AUTH_TEST_CONTENT_JS" file="gaia_auth/test/conte nt.js" type="BINDATA" />
35 </if>
25 <if expr="pp_ifdef('file_manager_extension')"> 36 <if expr="pp_ifdef('file_manager_extension')">
26 <include name="IDR_FILE_MANAGER_MAIN" file="file_manager/main.html" flat tenhtml="true" allowexternalscript="true" type="BINDATA" /> 37 <include name="IDR_FILE_MANAGER_MAIN" file="file_manager/main.html" flat tenhtml="true" allowexternalscript="true" type="BINDATA" />
27 <include name="IDR_FILE_MANAGER_MAIN_JS" file="file_manager/js/main_scri pts.js" flattenhtml="true" type="BINDATA" /> 38 <include name="IDR_FILE_MANAGER_MAIN_JS" file="file_manager/js/main_scri pts.js" flattenhtml="true" type="BINDATA" />
28 <include name="IDR_FILE_MANAGER_MEDIAPLAYER" file="file_manager/mediapla yer.html" allowexternalscript="true" flattenhtml="true" type="BINDATA" /> 39 <include name="IDR_FILE_MANAGER_MEDIAPLAYER" file="file_manager/mediapla yer.html" allowexternalscript="true" flattenhtml="true" type="BINDATA" />
29 <include name="IDR_FILE_MANAGER_MEDIAPLAYER_JS" file="file_manager/js/me dia/mediaplayer_scripts.js" flattenhtml="true" type="BINDATA" /> 40 <include name="IDR_FILE_MANAGER_MEDIAPLAYER_JS" file="file_manager/js/me dia/mediaplayer_scripts.js" flattenhtml="true" type="BINDATA" />
30 <include name="IDR_FILE_MANAGER_IMAGE_EDITOR" file="file_manager/gallery .html" allowexternalscript="true" flattenhtml="true" type="BINDATA" /> 41 <include name="IDR_FILE_MANAGER_IMAGE_EDITOR" file="file_manager/gallery .html" allowexternalscript="true" flattenhtml="true" type="BINDATA" />
31 <include name="IDR_FILE_MANAGER_IMAGE_EDITOR_JS" file="file_manager/js/i mage_editor/gallery_scripts.js" flattenhtml="true" type="BINDATA" /> 42 <include name="IDR_FILE_MANAGER_IMAGE_EDITOR_JS" file="file_manager/js/i mage_editor/gallery_scripts.js" flattenhtml="true" type="BINDATA" />
32 <include name="IDR_FILE_MANAGER_UTIL" file="file_manager/js/util.js" typ e="BINDATA" /> 43 <include name="IDR_FILE_MANAGER_UTIL" file="file_manager/js/util.js" typ e="BINDATA" />
33 <include name="IDR_FILE_MANAGER_METADATA_DISPATCHER" file="file_manager/ js/metadata/metadata_dispatcher.js" type="BINDATA" /> 44 <include name="IDR_FILE_MANAGER_METADATA_DISPATCHER" file="file_manager/ js/metadata/metadata_dispatcher.js" type="BINDATA" />
34 <include name="IDR_FILE_MANAGER_METADATA_READER" file="file_manager/js/m etadata/byte_reader.js" type="BINDATA" /> 45 <include name="IDR_FILE_MANAGER_METADATA_READER" file="file_manager/js/m etadata/byte_reader.js" type="BINDATA" />
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 <include name="IDR_FILE_MANAGER_MEDIAPLAYER_PLAY_DOWN" file="file_manage r/images/media/media_play_audio_down.png" type="BINDATA" /> 218 <include name="IDR_FILE_MANAGER_MEDIAPLAYER_PLAY_DOWN" file="file_manage r/images/media/media_play_audio_down.png" type="BINDATA" />
208 <include name="IDR_FILE_MANAGER_MEDIAPLAYER_PREVIOUS" file="file_manager /images/media/media_previous.png" type="BINDATA" /> 219 <include name="IDR_FILE_MANAGER_MEDIAPLAYER_PREVIOUS" file="file_manager /images/media/media_previous.png" type="BINDATA" />
209 <include name="IDR_FILE_MANAGER_MEDIAPLAYER_PREVIOUS_HOVER" file="file_m anager/images/media/media_previous_hover.png" type="BINDATA" /> 220 <include name="IDR_FILE_MANAGER_MEDIAPLAYER_PREVIOUS_HOVER" file="file_m anager/images/media/media_previous_hover.png" type="BINDATA" />
210 <include name="IDR_FILE_MANAGER_MEDIAPLAYER_PREVIOUS_DOWN" file="file_ma nager/images/media/media_previous_down.png" type="BINDATA" /> 221 <include name="IDR_FILE_MANAGER_MEDIAPLAYER_PREVIOUS_DOWN" file="file_ma nager/images/media/media_previous_down.png" type="BINDATA" />
211 222
212 <include name="IDR_FILE_MANAGER_MEDIA_ERROR" file="file_manager/images/m edia/error.png" type="BINDATA" /> 223 <include name="IDR_FILE_MANAGER_MEDIA_ERROR" file="file_manager/images/m edia/error.png" type="BINDATA" />
213 </if> 224 </if>
214 </includes> 225 </includes>
215 </release> 226 </release>
216 </grit> 227 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/login/screen_gaia_signin.js ('k') | chrome/browser/resources/gaia_auth/OWNERS » ('j') | chrome/browser/resources/gaia_auth/test/content.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698