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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 130963006: Reimplement inline signin with iframe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: enhance background.js to support multi-instances Created 6 years, 10 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/renderer_host/chrome_resource_dispatcher_host_delegate.cc ('k') | chrome/browser/resources/gaia_auth/background.js » ('j') | chrome/browser/resources/gaia_auth/background.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" />
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 <include name="IDR_GAIA_AUTH_MAIN_CSS" file="gaia_auth/main.css" type="BIN DATA" /> 54 <include name="IDR_GAIA_AUTH_MAIN_CSS" file="gaia_auth/main.css" type="BIN DATA" />
55 <include name="IDR_GAIA_AUTH_OFFLINE" file="gaia_auth/offline.html" allowe xternalscript="true" type="BINDATA" /> 55 <include name="IDR_GAIA_AUTH_OFFLINE" file="gaia_auth/offline.html" allowe xternalscript="true" type="BINDATA" />
56 <include name="IDR_GAIA_AUTH_OFFLINE_JS" file="gaia_auth/offline.js" type= "BINDATA" /> 56 <include name="IDR_GAIA_AUTH_OFFLINE_JS" file="gaia_auth/offline.js" type= "BINDATA" />
57 <include name="IDR_GAIA_AUTH_OFFLINE_CSS" file="gaia_auth/offline.css" typ e="BINDATA" /> 57 <include name="IDR_GAIA_AUTH_OFFLINE_CSS" file="gaia_auth/offline.css" typ e="BINDATA" />
58 <include name="IDR_GAIA_AUTH_SUCCESS" file="gaia_auth/success.html" allowe xternalscript="true" type="BINDATA" /> 58 <include name="IDR_GAIA_AUTH_SUCCESS" file="gaia_auth/success.html" allowe xternalscript="true" type="BINDATA" />
59 <include name="IDR_GAIA_AUTH_SUCCESS_JS" file="gaia_auth/success.js" type= "BINDATA" /> 59 <include name="IDR_GAIA_AUTH_SUCCESS_JS" file="gaia_auth/success.js" type= "BINDATA" />
60 <include name="IDR_GAIA_AUTH_UTIL_JS" file="gaia_auth/util.js" type="BINDA TA" /> 60 <include name="IDR_GAIA_AUTH_UTIL_JS" file="gaia_auth/util.js" type="BINDA TA" />
61 <include name="IDR_GAIA_AUTH_BACKGROUND_JS" file="gaia_auth/background.js" type="BINDATA" /> 61 <include name="IDR_GAIA_AUTH_BACKGROUND_JS" file="gaia_auth/background.js" type="BINDATA" />
62 <include name="IDR_GAIA_AUTH_SAML_INJECTED_JS" file="gaia_auth/saml_inject ed.js" type="BINDATA" /> 62 <include name="IDR_GAIA_AUTH_SAML_INJECTED_JS" file="gaia_auth/saml_inject ed.js" type="BINDATA" />
63 <include name="IDR_GAIA_AUTH_CHANNEL_JS" file="gaia_auth/channel.js" type= "BINDATA" /> 63 <include name="IDR_GAIA_AUTH_CHANNEL_JS" file="gaia_auth/channel.js" type= "BINDATA" />
64 <include name="IDR_GAIA_AUTH_INLINE_INJECTED_JS" file="gaia_auth/inline_in jected.js" type="BINDATA" /> 64 <include name="IDR_GAIA_AUTH_DESKTOP_INJECTED_JS" file="gaia_auth/desktop_ injected.js" type="BINDATA" />
65 <include name="IDR_GAIA_AUTH_INLINE_MAIN" file="gaia_auth/inline_main.html " allowexternalscript="true" type="BINDATA" />
66 <!-- Hangout Services extension, included in Google Chrome builds only. -- > 65 <!-- Hangout Services extension, included in Google Chrome builds only. -- >
67 <if expr="pp_ifdef('_google_chrome')"> 66 <if expr="pp_ifdef('_google_chrome')">
68 <include name="IDR_HANGOUT_SERVICES_BACKGROUND_HTML" file="hangout_servi ces/background.html" type="BINDATA" /> 67 <include name="IDR_HANGOUT_SERVICES_BACKGROUND_HTML" file="hangout_servi ces/background.html" type="BINDATA" />
69 <include name="IDR_HANGOUT_SERVICES_THUNK_JS" file="hangout_services/thu nk.js" type="BINDATA" /> 68 <include name="IDR_HANGOUT_SERVICES_THUNK_JS" file="hangout_services/thu nk.js" type="BINDATA" />
70 </if> 69 </if>
71 <if expr="pp_ifdef('chromeos')"> 70 <if expr="pp_ifdef('chromeos')">
72 <!-- Background page loader --> 71 <!-- Background page loader -->
73 <include name="IDR_BACKLOADER_BACKGROUND_HTML" file="backloader/backgrou nd.html" type="BINDATA" /> 72 <include name="IDR_BACKLOADER_BACKGROUND_HTML" file="backloader/backgrou nd.html" type="BINDATA" />
74 <include name="IDR_BACKLOADER_BACKGROUND_JS" file="backloader/scripts/ba ckground.js" type="BINDATA" /> 73 <include name="IDR_BACKLOADER_BACKGROUND_JS" file="backloader/scripts/ba ckground.js" type="BINDATA" />
75 <include name="IDR_BACKLOADER_PAGES_JS" file="backloader/scripts/pages.j s" type="BINDATA" /> 74 <include name="IDR_BACKLOADER_PAGES_JS" file="backloader/scripts/pages.j s" type="BINDATA" />
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 <include name="IDR_SETTINGS_APP_JS" file="settings_app/settings_app.js" type="BINDATA" /> 204 <include name="IDR_SETTINGS_APP_JS" file="settings_app/settings_app.js" type="BINDATA" />
206 </if> 205 </if>
207 <if expr="pp_ifdef('enable_plugins')"> 206 <if expr="pp_ifdef('enable_plugins')">
208 <include name="IDR_PDF_HTML" file="pdf/pdf.html" allowexternalscript="tr ue" type="BINDATA" /> 207 <include name="IDR_PDF_HTML" file="pdf/pdf.html" allowexternalscript="tr ue" type="BINDATA" />
209 <include name="IDR_PDF_BACKGROUND_JS" file="pdf/background.js" type="BIN DATA" /> 208 <include name="IDR_PDF_BACKGROUND_JS" file="pdf/background.js" type="BIN DATA" />
210 <include name="IDR_PDF_JS" file="pdf/pdf.js" type="BINDATA" /> 209 <include name="IDR_PDF_JS" file="pdf/pdf.js" type="BINDATA" />
211 </if> 210 </if>
212 </includes> 211 </includes>
213 </release> 212 </release>
214 </grit> 213 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc ('k') | chrome/browser/resources/gaia_auth/background.js » ('j') | chrome/browser/resources/gaia_auth/background.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698