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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/browser_resources.grd

Issue 130963006: Reimplement inline signin with iframe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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/chrome_content_browser_client.cc » ('j') | chrome/browser/chrome_content_browser_client.cc » ('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 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <structures> 10 <structures>
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 <include name="IDR_USER_ACTIONS_CSS" file="resources\user_actions\user_act ions.css" type="BINDATA" /> 283 <include name="IDR_USER_ACTIONS_CSS" file="resources\user_actions\user_act ions.css" type="BINDATA" />
284 <include name="IDR_USER_ACTIONS_JS" file="resources\user_actions\user_acti ons.js" type="BINDATA" /> 284 <include name="IDR_USER_ACTIONS_JS" file="resources\user_actions\user_acti ons.js" type="BINDATA" />
285 <if expr="pp_ifdef('enable_webrtc')"> 285 <if expr="pp_ifdef('enable_webrtc')">
286 <include name="IDR_WEBRTC_LOGS_HTML" file="resources\media\webrtc_logs.h tml" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 286 <include name="IDR_WEBRTC_LOGS_HTML" file="resources\media\webrtc_logs.h tml" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
287 <include name="IDR_WEBRTC_LOGS_JS" file="resources\media\webrtc_logs.js" type="BINDATA" /> 287 <include name="IDR_WEBRTC_LOGS_JS" file="resources\media\webrtc_logs.js" type="BINDATA" />
288 </if> 288 </if>
289 <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifes t.json" type="BINDATA" /> 289 <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifes t.json" type="BINDATA" />
290 <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifest. json" type="BINDATA" /> 290 <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifest. json" type="BINDATA" />
291 <include name="IDR_GAIA_AUTH_KEYBOARD_MANIFEST" file="resources\gaia_auth\ manifest_keyboard.json" type="BINDATA" /> 291 <include name="IDR_GAIA_AUTH_KEYBOARD_MANIFEST" file="resources\gaia_auth\ manifest_keyboard.json" type="BINDATA" />
292 <include name="IDR_GAIA_AUTH_SAML_MANIFEST" file="resources\gaia_auth\mani fest_saml.json" type="BINDATA" /> 292 <include name="IDR_GAIA_AUTH_SAML_MANIFEST" file="resources\gaia_auth\mani fest_saml.json" type="BINDATA" />
293 <include name="IDR_GAIA_AUTH_INLINE_MANIFEST" file="resources\gaia_auth\ma nifest_inline.json" type="BINDATA" /> 293 <include name="IDR_GAIA_AUTH_DESKTOP_MANIFEST" file="resources\gaia_auth\m anifest_desktop.json" type="BINDATA" />
xiyuan 2014/01/26 01:59:57 This file seems missed from the CL.
guohui 2014/01/29 12:50:51 Done.
294 <if expr="pp_ifdef('chromeos')"> 294 <if expr="pp_ifdef('chromeos')">
295 <include name="IDR_BACKLOADER_MANIFEST" file="resources\backloader\manif est.json" type="BINDATA" /> 295 <include name="IDR_BACKLOADER_MANIFEST" file="resources\backloader\manif est.json" type="BINDATA" />
296 <include name="IDR_CHOOSE_MOBILE_NETWORK_HTML" file="resources\chromeos\ choose_mobile_network.html" flattenhtml="true" allowexternalscript="true" type=" BINDATA" /> 296 <include name="IDR_CHOOSE_MOBILE_NETWORK_HTML" file="resources\chromeos\ choose_mobile_network.html" flattenhtml="true" allowexternalscript="true" type=" BINDATA" />
297 <include name="IDR_CHOOSE_MOBILE_NETWORK_JS" file="resources\chromeos\ch oose_mobile_network.js" type="BINDATA" /> 297 <include name="IDR_CHOOSE_MOBILE_NETWORK_JS" file="resources\chromeos\ch oose_mobile_network.js" type="BINDATA" />
298 <include name="IDR_CROSH_BUILTIN_MANIFEST" file="resources\chromeos\cros h_builtin\manifest.json" type="BINDATA" /> 298 <include name="IDR_CROSH_BUILTIN_MANIFEST" file="resources\chromeos\cros h_builtin\manifest.json" type="BINDATA" />
299 <include name="IDR_CRYPTOHOME_HTML" file="resources\chromeos\cryptohome. html" flattenhtml="true" type="BINDATA" /> 299 <include name="IDR_CRYPTOHOME_HTML" file="resources\chromeos\cryptohome. html" flattenhtml="true" type="BINDATA" />
300 <include name="IDR_CRYPTOHOME_JS" file="resources\chromeos\cryptohome.js " type="BINDATA" /> 300 <include name="IDR_CRYPTOHOME_JS" file="resources\chromeos\cryptohome.js " type="BINDATA" />
301 <!-- manifest file of ChromeVox accessibility extension --> 301 <!-- manifest file of ChromeVox accessibility extension -->
302 <include name="IDR_CHROMEVOX_MANIFEST" file="resources\chromeos\chromevo x\manifest.json" type="BINDATA" /> 302 <include name="IDR_CHROMEVOX_MANIFEST" file="resources\chromeos\chromevo x\manifest.json" type="BINDATA" />
303 <!-- manifest file of Connectivity Diagnostics app --> 303 <!-- manifest file of Connectivity Diagnostics app -->
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 <include name="IDR_SOUND_VOLUME_ADJUST_WAV" file="resources\chromeos\sou nds\volume_adjust.wav" type="BINDATA" /> 412 <include name="IDR_SOUND_VOLUME_ADJUST_WAV" file="resources\chromeos\sou nds\volume_adjust.wav" type="BINDATA" />
413 </if> 413 </if>
414 <if expr="pp_ifdef('chromeos')"> 414 <if expr="pp_ifdef('chromeos')">
415 <include name="IDR_ABOUT_POWER_HTML" file="resources\chromeos\power.html " type="BINDATA" /> 415 <include name="IDR_ABOUT_POWER_HTML" file="resources\chromeos\power.html " type="BINDATA" />
416 <include name="IDR_ABOUT_POWER_JS" file="resources\chromeos\power.js" ty pe="BINDATA" /> 416 <include name="IDR_ABOUT_POWER_JS" file="resources\chromeos\power.js" ty pe="BINDATA" />
417 <include name="IDR_ABOUT_POWER_CSS" file="resources\chromeos\power.css" type="BINDATA" /> 417 <include name="IDR_ABOUT_POWER_CSS" file="resources\chromeos\power.css" type="BINDATA" />
418 </if> 418 </if>
419 </includes> 419 </includes>
420 </release> 420 </release>
421 </grit> 421 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | chrome/browser/chrome_content_browser_client.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698