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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 606083002: patch from issue 473153002 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix saml Created 6 years, 2 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
« no previous file with comments | « chrome/browser/resources/chromeos/login/screen_gaia_signin.js ('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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_CSS_JS" file="bookmark_manage r/css/bmm.css.js" type="BINDATA" /> 42 <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_CSS_JS" file="bookmark_manage r/css/bmm.css.js" type="BINDATA" />
43 <!-- Gaia auth extension --> 43 <!-- Gaia auth extension -->
44 <include name="IDR_GAIA_AUTH_KEYBOARD_UI_CSS" file="gaia_auth/keyboard_ui. css" type="BINDATA" /> 44 <include name="IDR_GAIA_AUTH_KEYBOARD_UI_CSS" file="gaia_auth/keyboard_ui. css" type="BINDATA" />
45 <include name="IDR_GAIA_AUTH_MAIN" file="gaia_auth/main.html" allowexterna lscript="true" type="BINDATA" /> 45 <include name="IDR_GAIA_AUTH_MAIN" file="gaia_auth/main.html" allowexterna lscript="true" type="BINDATA" />
46 <include name="IDR_GAIA_AUTH_MAIN_JS" file="gaia_auth/main.js" type="BINDA TA" /> 46 <include name="IDR_GAIA_AUTH_MAIN_JS" file="gaia_auth/main.js" type="BINDA TA" />
47 <include name="IDR_GAIA_AUTH_MAIN_CSS" file="gaia_auth/main.css" type="BIN DATA" /> 47 <include name="IDR_GAIA_AUTH_MAIN_CSS" file="gaia_auth/main.css" type="BIN DATA" />
48 <include name="IDR_GAIA_AUTH_OFFLINE" file="gaia_auth/offline.html" allowe xternalscript="true" type="BINDATA" /> 48 <include name="IDR_GAIA_AUTH_OFFLINE" file="gaia_auth/offline.html" allowe xternalscript="true" type="BINDATA" />
49 <include name="IDR_GAIA_AUTH_OFFLINE_JS" file="gaia_auth/offline.js" type= "BINDATA" /> 49 <include name="IDR_GAIA_AUTH_OFFLINE_JS" file="gaia_auth/offline.js" type= "BINDATA" />
50 <include name="IDR_GAIA_AUTH_OFFLINE_CSS" file="gaia_auth/offline.css" typ e="BINDATA" /> 50 <include name="IDR_GAIA_AUTH_OFFLINE_CSS" file="gaia_auth/offline.css" typ e="BINDATA" />
51 <include name="IDR_GAIA_AUTH_SUCCESS" file="gaia_auth/success.html" allowe xternalscript="true" type="BINDATA" /> 51 <include name="IDR_GAIA_AUTH_SUCCESS" file="gaia_auth/success.html" allowe xternalscript="true" type="BINDATA" />
52 <include name="IDR_GAIA_AUTH_SUCCESS_JS" file="gaia_auth/success.js" type= "BINDATA" />
53 <include name="IDR_GAIA_AUTH_UTIL_JS" file="gaia_auth/util.js" type="BINDA TA" /> 52 <include name="IDR_GAIA_AUTH_UTIL_JS" file="gaia_auth/util.js" type="BINDA TA" />
54 <include name="IDR_GAIA_AUTH_BACKGROUND_JS" file="gaia_auth/background.js" type="BINDATA" /> 53 <include name="IDR_GAIA_AUTH_BACKGROUND_JS" file="gaia_auth/background.js" type="BINDATA" />
55 <include name="IDR_GAIA_AUTH_SAML_INJECTED_JS" file="gaia_auth/saml_inject ed.js" type="BINDATA" /> 54 <include name="IDR_GAIA_AUTH_SAML_INJECTED_JS" file="gaia_auth/saml_inject ed.js" type="BINDATA" />
56 <include name="IDR_GAIA_AUTH_CHANNEL_JS" file="gaia_auth/channel.js" type= "BINDATA" /> 55 <include name="IDR_GAIA_AUTH_CHANNEL_JS" file="gaia_auth/channel.js" type= "BINDATA" />
57 <!-- Hangout Services extension, included in Google Chrome builds only. -- > 56 <!-- Hangout Services extension, included in Google Chrome builds only. -- >
58 <if expr="_google_chrome or enable_hangout_services_extension"> 57 <if expr="_google_chrome or enable_hangout_services_extension">
59 <include name="IDR_HANGOUT_SERVICES_BACKGROUND_HTML" file="hangout_servi ces/background.html" type="BINDATA" /> 58 <include name="IDR_HANGOUT_SERVICES_BACKGROUND_HTML" file="hangout_servi ces/background.html" type="BINDATA" />
60 <include name="IDR_HANGOUT_SERVICES_THUNK_JS" file="hangout_services/thu nk.js" type="BINDATA" /> 59 <include name="IDR_HANGOUT_SERVICES_THUNK_JS" file="hangout_services/thu nk.js" type="BINDATA" />
61 </if> 60 </if>
62 <if expr="enable_extensions"> 61 <if expr="enable_extensions">
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 <!-- The next two files have a .png extension since grit for some reason 208 <!-- The next two files have a .png extension since grit for some reason
210 won't compile these files in if they are named .nmf/.pexe or 209 won't compile these files in if they are named .nmf/.pexe or
211 anything remotely similar to their actual extension. Naming these 210 anything remotely similar to their actual extension. Naming these
212 .js or .html breaks all kinds of presubmit checks, hence .png seems 211 .js or .html breaks all kinds of presubmit checks, hence .png seems
213 to be the only viable option at the moment. --> 212 to be the only viable option at the moment. -->
214 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_NMF" file="whis pernet_proxy/whispernet_proxy.nmf.png" type="BINDATA" /> 213 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_NMF" file="whis pernet_proxy/whispernet_proxy.nmf.png" type="BINDATA" />
215 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_PEXE" file="whi spernet_proxy/whispernet_proxy_pnacl.pexe.png" type="BINDATA" /> 214 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_PEXE" file="whi spernet_proxy/whispernet_proxy_pnacl.pexe.png" type="BINDATA" />
216 </includes> 215 </includes>
217 </release> 216 </release>
218 </grit> 217 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/login/screen_gaia_signin.js ('k') | chrome/browser/resources/gaia_auth/background.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698