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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2142933006: arc: Implement scrollable OptIn window content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: style changes Created 4 years, 5 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/arc_support/main.html ('k') | no next file » | 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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_SUPPORT_BACKGROUND_JS" file="chromeos/arc_support /background.js" flattenhtml="true" type="BINDATA" /> 147 <include name="IDR_ARC_SUPPORT_BACKGROUND_JS" file="chromeos/arc_support /background.js" flattenhtml="true" type="BINDATA" />
148 <include name="IDR_ARC_SUPPORT_MAIN_CSS" file="chromeos/arc_support/main .css" type="BINDATA" /> 148 <include name="IDR_ARC_SUPPORT_MAIN_CSS" file="chromeos/arc_support/main .css" type="BINDATA" />
149 <include name="IDR_ARC_SUPPORT_LSO_CSS" file="chromeos/arc_support/lso.c ss" type="BINDATA" />
149 <include name="IDR_ARC_SUPPORT_PLAYSTORE_CSS" file="chromeos/arc_support /playstore.css" type="BINDATA" /> 150 <include name="IDR_ARC_SUPPORT_PLAYSTORE_CSS" file="chromeos/arc_support /playstore.css" type="BINDATA" />
150 <include name="IDR_ARC_SUPPORT_PLAYSTORE_JS" file="chromeos/arc_support/ playstore.js" type="BINDATA" /> 151 <include name="IDR_ARC_SUPPORT_PLAYSTORE_JS" file="chromeos/arc_support/ playstore.js" type="BINDATA" />
151 <include name="IDR_ARC_SUPPORT_MAIN" file="chromeos/arc_support/main.htm l" allowexternalscript="true" type="BINDATA" /> 152 <include name="IDR_ARC_SUPPORT_MAIN" file="chromeos/arc_support/main.htm l" allowexternalscript="true" type="BINDATA" />
152 <include name="IDR_ARC_SUPPORT_ICON" file="chromeos/arc_support/icon/48. png" type="BINDATA" /> 153 <include name="IDR_ARC_SUPPORT_ICON" file="chromeos/arc_support/icon/48. png" type="BINDATA" />
153 <include name="IDR_ARC_SUPPORT_ICON_HEADER" file="chromeos/arc_support/i mages/header.png" type="BINDATA" /> 154 <include name="IDR_ARC_SUPPORT_ICON_HEADER" file="chromeos/arc_support/i mages/header.png" type="BINDATA" />
154 </if> 155 </if>
155 <if expr="enable_settings_app"> 156 <if expr="enable_settings_app">
156 <include name="IDR_SETTINGS_APP_JS" file="settings_app/settings_app.js" type="BINDATA" /> 157 <include name="IDR_SETTINGS_APP_JS" file="settings_app/settings_app.js" type="BINDATA" />
157 </if> 158 </if>
158 <if expr="enable_plugins"> 159 <if expr="enable_plugins">
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 <!-- The next two files have a .png extension since grit for some reason 254 <!-- The next two files have a .png extension since grit for some reason
254 won't compile these files in if they are named .nmf/.pexe or 255 won't compile these files in if they are named .nmf/.pexe or
255 anything remotely similar to their actual extension. Naming these 256 anything remotely similar to their actual extension. Naming these
256 .js or .html breaks all kinds of presubmit checks, hence .png seems 257 .js or .html breaks all kinds of presubmit checks, hence .png seems
257 to be the only viable option at the moment. --> 258 to be the only viable option at the moment. -->
258 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_NMF" file="whis pernet_proxy/whispernet_proxy.nmf.png" type="BINDATA" /> 259 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_NMF" file="whis pernet_proxy/whispernet_proxy.nmf.png" type="BINDATA" />
259 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_PEXE" file="whi spernet_proxy/whispernet_proxy_pnacl.pexe.png" type="BINDATA" /> 260 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_PEXE" file="whi spernet_proxy/whispernet_proxy_pnacl.pexe.png" type="BINDATA" />
260 </includes> 261 </includes>
261 </release> 262 </release>
262 </grit> 263 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/arc_support/main.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698