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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/browser_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 | « no previous file | chrome/browser/extensions/component_loader.h » ('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 <grit latest_public_release="0" current_release="1"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/browser_resources.h" type="rc_header"> 4 <output filename="grit/browser_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="browser_resources.pak" type="data_package" /> 7 <output filename="browser_resources.pak" type="data_package" />
8 <output filename="browser_resources.rc" type="rc_all" /> 8 <output filename="browser_resources.rc" type="rc_all" />
9 </outputs> 9 </outputs>
10 <release seq="1"> 10 <release seq="1">
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 <include name="IDR_SYNC_PROMO_JS" file="resources\sync_promo\sync_promo. js" flattenhtml="true" type="BINDATA" /> 145 <include name="IDR_SYNC_PROMO_JS" file="resources\sync_promo\sync_promo. js" flattenhtml="true" type="BINDATA" />
146 <include name="IDR_SYNC_PROMO_HTML" file="resources\sync_promo\sync_prom o.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 146 <include name="IDR_SYNC_PROMO_HTML" file="resources\sync_promo\sync_prom o.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
147 </if> 147 </if>
148 <if expr="pp_ifdef('chromeos')"> 148 <if expr="pp_ifdef('chromeos')">
149 <include name="IDR_ABOUT_SYS_HTML" file="resources\chromeos\about_sys.ht ml" flattenhtml="true" type="BINDATA" /> 149 <include name="IDR_ABOUT_SYS_HTML" file="resources\chromeos\about_sys.ht ml" flattenhtml="true" type="BINDATA" />
150 <include name="IDR_CHOOSE_MOBILE_NETWORK_HTML" file="resources\chromeos\ choose_mobile_network.html" flattenhtml="true" allowexternalscript="true" type=" BINDATA" /> 150 <include name="IDR_CHOOSE_MOBILE_NETWORK_HTML" file="resources\chromeos\ choose_mobile_network.html" flattenhtml="true" allowexternalscript="true" type=" BINDATA" />
151 <include name="IDR_CHOOSE_MOBILE_NETWORK_JS" file="resources\chromeos\ch oose_mobile_network.js" type="BINDATA" /> 151 <include name="IDR_CHOOSE_MOBILE_NETWORK_JS" file="resources\chromeos\ch oose_mobile_network.js" type="BINDATA" />
152 <include name="IDR_CROSH_BUILTIN_MANIFEST" file="resources\chromeos\cros h_builtin\manifest.json" type="BINDATA" /> 152 <include name="IDR_CROSH_BUILTIN_MANIFEST" file="resources\chromeos\cros h_builtin\manifest.json" type="BINDATA" />
153 <!-- manifest file of ChromeVox accessibility extension --> 153 <!-- manifest file of ChromeVox accessibility extension -->
154 <include name="IDR_CHROMEVOX_MANIFEST" file="resources\chromeos\access_c hromevox\manifest.json" type="BINDATA" /> 154 <include name="IDR_CHROMEVOX_MANIFEST" file="resources\chromeos\access_c hromevox\manifest.json" type="BINDATA" />
155 <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\chromeos\gaia_aut h\manifest.json" type="BINDATA" /> 155 <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifes t.json" type="BINDATA" />
156 <include name="IDR_GAIA_TEST_AUTH_MANIFEST" file="resources\chromeos\gai a_auth\manifest_test.json" type="BINDATA" /> 156 <include name="IDR_GAIA_TEST_AUTH_MANIFEST" file="resources\gaia_auth\ma nifest_test.json" type="BINDATA" />
157 <include name="IDR_GUEST_SESSION_TAB_HTML" file="resources\chromeos\gues t_session_tab.html" flattenhtml="true" type="BINDATA" /> 157 <include name="IDR_GUEST_SESSION_TAB_HTML" file="resources\chromeos\gues t_session_tab.html" flattenhtml="true" type="BINDATA" />
158 <include name="IDR_HOST_REGISTRATION_PAGE_HTML" file="resources\chromeos \host_registration_page.html" flattenhtml="true" type="BINDATA" /> 158 <include name="IDR_HOST_REGISTRATION_PAGE_HTML" file="resources\chromeos \host_registration_page.html" flattenhtml="true" type="BINDATA" />
159 <include name="IDR_IMAGEBURNER_HTML" file="resources\chromeos\image_burn er.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 159 <include name="IDR_IMAGEBURNER_HTML" file="resources\chromeos\image_burn er.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
160 <include name="IDR_IMAGEBURNER_JS" file="resources\chromeos\image_burner .js" type="BINDATA" /> 160 <include name="IDR_IMAGEBURNER_JS" file="resources\chromeos\image_burner .js" type="BINDATA" />
161 <include name="IDR_KEYBOARD_OVERLAY_CSS" file="resources\chromeos\keyboa rd_overlay.css" flattenhtml="true" type="BINDATA" /> 161 <include name="IDR_KEYBOARD_OVERLAY_CSS" file="resources\chromeos\keyboa rd_overlay.css" flattenhtml="true" type="BINDATA" />
162 <include name="IDR_KEYBOARD_OVERLAY_HTML" file="resources\chromeos\keybo ard_overlay.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" / > 162 <include name="IDR_KEYBOARD_OVERLAY_HTML" file="resources\chromeos\keybo ard_overlay.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" / >
163 <include name="IDR_KEYBOARD_OVERLAY_JS" file="resources\chromeos\keyboar d_overlay.js" flattenhtml="true" type="BINDATA" /> 163 <include name="IDR_KEYBOARD_OVERLAY_JS" file="resources\chromeos\keyboar d_overlay.js" flattenhtml="true" type="BINDATA" />
164 <include name="IDR_LOGIN_HTML" file="resources\chromeos\login\login.html " flattenhtml="true" type="BINDATA" /> 164 <include name="IDR_LOGIN_HTML" file="resources\chromeos\login\login.html " flattenhtml="true" type="BINDATA" />
165 <include name="IDR_DEMO_USER_LOGIN_HTML" file="resources\chromeos\login\ demo_user_login.html" flattenhtml="true" type="BINDATA" /> 165 <include name="IDR_DEMO_USER_LOGIN_HTML" file="resources\chromeos\login\ demo_user_login.html" flattenhtml="true" type="BINDATA" />
166 <include name="IDR_MENU_HTML" file="resources\chromeos\menu.html" flatte nhtml="true" type="BINDATA" /> 166 <include name="IDR_MENU_HTML" file="resources\chromeos\menu.html" flatte nhtml="true" type="BINDATA" />
(...skipping 17 matching lines...) Expand all
184 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_aura') "> 184 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_aura') ">
185 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" /> 185 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" />
186 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" /> 186 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" />
187 </if> 187 </if>
188 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 188 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
189 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 189 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
190 </if> 190 </if>
191 </includes> 191 </includes>
192 </release> 192 </release>
193 </grit> 193 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/component_loader.h » ('j') | chrome/browser/resources/gaia_auth/test/content.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698