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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1681813003: arc: Use incognito profile for OptIn and cookie fetcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup Created 4 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
« chrome/browser/resources/chromeos/arc_opt_in/main.html ('K') | « chrome/browser/resources/chromeos/arc_opt_in/manifest.json ('k') | chrome/chrome_browser_chromeos.gypi » ('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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 <include name="IDR_WALLPAPER_MANAGER_UTIL_JS" file="chromeos/wallpaper_m anager/js/util.js" flattenhtml="true" type="BINDATA" /> 137 <include name="IDR_WALLPAPER_MANAGER_UTIL_JS" file="chromeos/wallpaper_m anager/js/util.js" flattenhtml="true" type="BINDATA" />
138 <include name="IDR_FIRST_RUN_DIALOG_BACKGROUND_JS" file="chromeos/first_ run/app/background.js" flattenhtml="true" type="BINDATA" /> 138 <include name="IDR_FIRST_RUN_DIALOG_BACKGROUND_JS" file="chromeos/first_ run/app/background.js" flattenhtml="true" type="BINDATA" />
139 <include name="IDR_FIRST_RUN_DIALOG_MAIN_JS" file="chromeos/first_run/ap p/main.js" flattenhtml="true" type="BINDATA" /> 139 <include name="IDR_FIRST_RUN_DIALOG_MAIN_JS" file="chromeos/first_run/ap p/main.js" flattenhtml="true" type="BINDATA" />
140 <include name="IDR_FIRST_RUN_DIALOG_ICON_16" file="chromeos/first_run/ap p/icon/16.png" type="BINDATA" /> 140 <include name="IDR_FIRST_RUN_DIALOG_ICON_16" file="chromeos/first_run/ap p/icon/16.png" type="BINDATA" />
141 <include name="IDR_FIRST_RUN_DIALOG_ICON_32" file="chromeos/first_run/ap p/icon/32.png" type="BINDATA" /> 141 <include name="IDR_FIRST_RUN_DIALOG_ICON_32" file="chromeos/first_run/ap p/icon/32.png" type="BINDATA" />
142 <include name="IDR_FIRST_RUN_DIALOG_ICON_48" file="chromeos/first_run/ap p/icon/48.png" type="BINDATA" /> 142 <include name="IDR_FIRST_RUN_DIALOG_ICON_48" file="chromeos/first_run/ap p/icon/48.png" type="BINDATA" />
143 <include name="IDR_FIRST_RUN_DIALOG_ICON_64" file="chromeos/first_run/ap p/icon/64.png" type="BINDATA" /> 143 <include name="IDR_FIRST_RUN_DIALOG_ICON_64" file="chromeos/first_run/ap p/icon/64.png" type="BINDATA" />
144 <include name="IDR_FIRST_RUN_DIALOG_ICON_96" file="chromeos/first_run/ap p/icon/96.png" type="BINDATA" /> 144 <include name="IDR_FIRST_RUN_DIALOG_ICON_96" file="chromeos/first_run/ap p/icon/96.png" type="BINDATA" />
145 <include name="IDR_FIRST_RUN_DIALOG_ICON_128" file="chromeos/first_run/a pp/icon/128.png" type="BINDATA" /> 145 <include name="IDR_FIRST_RUN_DIALOG_ICON_128" file="chromeos/first_run/a pp/icon/128.png" type="BINDATA" />
146 <include name="IDR_FIRST_RUN_DIALOG_ICON_256" file="chromeos/first_run/a pp/icon/256.png" type="BINDATA" /> 146 <include name="IDR_FIRST_RUN_DIALOG_ICON_256" file="chromeos/first_run/a pp/icon/256.png" type="BINDATA" />
147 <include name="IDR_ARC_OPT_IN_BACKGROUND_JS" file="chromeos/arc_opt_in/b ackground.js" flattenhtml="true" type="BINDATA" />
148 <include name="IDR_ARC_OPT_IN_MAIN" file="chromeos/arc_opt_in/main.html" allowexternalscript="true" type="BINDATA" />
147 </if> 149 </if>
148 <if expr="enable_settings_app"> 150 <if expr="enable_settings_app">
149 <include name="IDR_SETTINGS_APP_JS" file="settings_app/settings_app.js" type="BINDATA" /> 151 <include name="IDR_SETTINGS_APP_JS" file="settings_app/settings_app.js" type="BINDATA" />
150 </if> 152 </if>
151 <if expr="enable_plugins"> 153 <if expr="enable_plugins">
152 <include name="IDR_PDF_INDEX_CSS" file="pdf/index.css" allowexternalscri pt="true" type="BINDATA" /> 154 <include name="IDR_PDF_INDEX_CSS" file="pdf/index.css" allowexternalscri pt="true" type="BINDATA" />
153 <include name="IDR_PDF_INDEX_HTML" file="pdf/index.html" allowexternalsc ript="true" type="BINDATA" /> 155 <include name="IDR_PDF_INDEX_HTML" file="pdf/index.html" allowexternalsc ript="true" type="BINDATA" />
154 <include name="IDR_PDF_MAIN_JS" file="pdf/main.js" type="BINDATA" /> 156 <include name="IDR_PDF_MAIN_JS" file="pdf/main.js" type="BINDATA" />
155 <include name="IDR_PDF_PDF_JS" file="pdf/pdf.js" type="BINDATA" /> 157 <include name="IDR_PDF_PDF_JS" file="pdf/pdf.js" type="BINDATA" />
156 <include name="IDR_PDF_UI_MANAGER_JS" file="pdf/toolbar_manager.js" type ="BINDATA" /> 158 <include name="IDR_PDF_UI_MANAGER_JS" file="pdf/toolbar_manager.js" type ="BINDATA" />
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 <!-- The next two files have a .png extension since grit for some reason 247 <!-- The next two files have a .png extension since grit for some reason
246 won't compile these files in if they are named .nmf/.pexe or 248 won't compile these files in if they are named .nmf/.pexe or
247 anything remotely similar to their actual extension. Naming these 249 anything remotely similar to their actual extension. Naming these
248 .js or .html breaks all kinds of presubmit checks, hence .png seems 250 .js or .html breaks all kinds of presubmit checks, hence .png seems
249 to be the only viable option at the moment. --> 251 to be the only viable option at the moment. -->
250 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_NMF" file="whis pernet_proxy/whispernet_proxy.nmf.png" type="BINDATA" /> 252 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_NMF" file="whis pernet_proxy/whispernet_proxy.nmf.png" type="BINDATA" />
251 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_PEXE" file="whi spernet_proxy/whispernet_proxy_pnacl.pexe.png" type="BINDATA" /> 253 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_PEXE" file="whi spernet_proxy/whispernet_proxy_pnacl.pexe.png" type="BINDATA" />
252 </includes> 254 </includes>
253 </release> 255 </release>
254 </grit> 256 </grit>
OLDNEW
« chrome/browser/resources/chromeos/arc_opt_in/main.html ('K') | « chrome/browser/resources/chromeos/arc_opt_in/manifest.json ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698