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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 134263005: Implement inline signin with iframe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix for various iframe bugs 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') | 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 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="_google_chrome or enable_hangout_services_extension"> 66 <if expr="_google_chrome or enable_hangout_services_extension">
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 <!-- Hotword Helper extension --> 70 <!-- Hotword Helper extension -->
72 <include name="IDR_HOTWORD_HELPER_AUDIO_CLIENT_JS" file="hotword_helper/au dio_client.js" type="BINDATA" /> 71 <include name="IDR_HOTWORD_HELPER_AUDIO_CLIENT_JS" file="hotword_helper/au dio_client.js" type="BINDATA" />
73 <include name="IDR_HOTWORD_HELPER_OPTIN_CLIENT_JS" file="hotword_helper/op tin_client.js" type="BINDATA" /> 72 <include name="IDR_HOTWORD_HELPER_OPTIN_CLIENT_JS" file="hotword_helper/op tin_client.js" type="BINDATA" />
74 <include name="IDR_HOTWORD_HELPER_MANAGER_JS" file="hotword_helper/manager .js" type="BINDATA" /> 73 <include name="IDR_HOTWORD_HELPER_MANAGER_JS" file="hotword_helper/manager .js" type="BINDATA" />
75 <if expr="chromeos"> 74 <if expr="chromeos">
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 <include name="IDR_PDF_BUTTON_HIGH_1" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_fit_page.png" type="BINDATA" /> 226 <include name="IDR_PDF_BUTTON_HIGH_1" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_fit_page.png" type="BINDATA" />
228 <include name="IDR_PDF_BUTTON_HIGH_2" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_fit_width.png" type="BINDATA" /> 227 <include name="IDR_PDF_BUTTON_HIGH_2" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_fit_width.png" type="BINDATA" />
229 <include name="IDR_PDF_BUTTON_HIGH_3" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_zoom_out.png" type="BINDATA" /> 228 <include name="IDR_PDF_BUTTON_HIGH_3" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_zoom_out.png" type="BINDATA" />
230 <include name="IDR_PDF_BUTTON_HIGH_4" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_zoom_in.png" type="BINDATA" /> 229 <include name="IDR_PDF_BUTTON_HIGH_4" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_zoom_in.png" type="BINDATA" />
231 <include name="IDR_PDF_BUTTON_HIGH_5" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_save.png" type="BINDATA" /> 230 <include name="IDR_PDF_BUTTON_HIGH_5" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_save.png" type="BINDATA" />
232 <include name="IDR_PDF_BUTTON_HIGH_6" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_print.png" type="BINDATA" /> 231 <include name="IDR_PDF_BUTTON_HIGH_6" file="pdf/html_office/elements/vie wer-button/img/hiDPI/button_print.png" type="BINDATA" />
233 </if> 232 </if>
234 </includes> 233 </includes>
235 </release> 234 </release>
236 </grit> 235 </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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698