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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/browser_resources.grd

Issue 195983023: Enable devices page UI on MacOSX (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_dcheck
Patch Set: Created 6 years, 9 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/about_flags.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | chrome/browser/prefs/browser_prefs.cc » ('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 <grit latest_public_release="0" current_release="1"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/browser_resources.h" type="rc_header"> 4 <output filename="grit/browser_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="browser_resources.pak" type="data_package" /> 7 <output filename="browser_resources.pak" type="data_package" />
8 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <structures> 10 <structures>
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 <include name="IDR_PERFORMANCE_MONITOR_JQUERY_JS" file="..\..\third_part y\flot\jquery.min.js" type="BINDATA" /> 178 <include name="IDR_PERFORMANCE_MONITOR_JQUERY_JS" file="..\..\third_part y\flot\jquery.min.js" type="BINDATA" />
179 </if> 179 </if>
180 <include name="IDR_PREDICTORS_HTML" file="resources\predictors\predictors. html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 180 <include name="IDR_PREDICTORS_HTML" file="resources\predictors\predictors. html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
181 <include name="IDR_PREDICTORS_JS" file="resources\predictors\predictors.js " flattenhtml="true" type="BINDATA" /> 181 <include name="IDR_PREDICTORS_JS" file="resources\predictors\predictors.js " flattenhtml="true" type="BINDATA" />
182 <if expr="not is_android"> 182 <if expr="not is_android">
183 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification _1line.html" flattenhtml="true" type="BINDATA" /> 183 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification _1line.html" flattenhtml="true" type="BINDATA" />
184 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification _2line.html" flattenhtml="true" type="BINDATA" /> 184 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification _2line.html" flattenhtml="true" type="BINDATA" />
185 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ icon.html" type="BINDATA" /> 185 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ icon.html" type="BINDATA" />
186 </if> 186 </if>
187 187
188 <if expr="enable_mdns"> 188 <if expr="enable_service_discovery">
189 <include name="IDR_LOCAL_DISCOVERY_HTML" file="resources\local_discovery \local_discovery.html" flattenhtml="true" allowexternalscript="true" type="BINDA TA" /> 189 <include name="IDR_LOCAL_DISCOVERY_HTML" file="resources\local_discovery \local_discovery.html" flattenhtml="true" allowexternalscript="true" type="BINDA TA" />
190 <include name="IDR_LOCAL_DISCOVERY_CSS" file="resources\local_discovery\ local_discovery.css" type="BINDATA" /> 190 <include name="IDR_LOCAL_DISCOVERY_CSS" file="resources\local_discovery\ local_discovery.css" type="BINDATA" />
191 <include name="IDR_LOCAL_DISCOVERY_JS" file="resources\local_discovery\l ocal_discovery.js" flattenhtml="true" type="BINDATA" /> 191 <include name="IDR_LOCAL_DISCOVERY_JS" file="resources\local_discovery\l ocal_discovery.js" flattenhtml="true" type="BINDATA" />
192 <include name="IDR_LOCAL_DISCOVERY_PRINTER_PNG" file="resources\local_di scovery\printer.png" type="BINDATA" /> 192 <include name="IDR_LOCAL_DISCOVERY_PRINTER_PNG" file="resources\local_di scovery\printer.png" type="BINDATA" />
193 </if> 193 </if>
194 194
195 <include name="IDR_INSTANT_IFRAME_VALIDATION_JS" file="resources\local_ntp \instant_iframe_validation.js" type="BINDATA" /> 195 <include name="IDR_INSTANT_IFRAME_VALIDATION_JS" file="resources\local_ntp \instant_iframe_validation.js" type="BINDATA" />
196 <include name="IDR_LOCAL_NTP_HTML" file="resources\local_ntp\local_ntp.htm l" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 196 <include name="IDR_LOCAL_NTP_HTML" file="resources\local_ntp\local_ntp.htm l" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
197 <include name="IDR_LOCAL_NTP_CSS" file="resources\local_ntp\local_ntp.css" type="BINDATA" /> 197 <include name="IDR_LOCAL_NTP_CSS" file="resources\local_ntp\local_ntp.css" type="BINDATA" />
198 <include name="IDR_LOCAL_NTP_JS" file="resources\local_ntp\local_ntp.js" f lattenhtml="true" type="BINDATA" /> 198 <include name="IDR_LOCAL_NTP_JS" file="resources\local_ntp\local_ntp.js" f lattenhtml="true" type="BINDATA" />
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 <include name="IDR_ABOUT_POWER_HTML" file="resources\chromeos\power.html " type="BINDATA" /> 421 <include name="IDR_ABOUT_POWER_HTML" file="resources\chromeos\power.html " type="BINDATA" />
422 <include name="IDR_ABOUT_POWER_JS" file="resources\chromeos\power.js" ty pe="BINDATA" /> 422 <include name="IDR_ABOUT_POWER_JS" file="resources\chromeos\power.js" ty pe="BINDATA" />
423 <include name="IDR_ABOUT_POWER_CSS" file="resources\chromeos\power.css" type="BINDATA" /> 423 <include name="IDR_ABOUT_POWER_CSS" file="resources\chromeos\power.css" type="BINDATA" />
424 </if> 424 </if>
425 <include name="IDR_GCM_INTERNALS_HTML" file="resources\gcm_internals.html" type="BINDATA" /> 425 <include name="IDR_GCM_INTERNALS_HTML" file="resources\gcm_internals.html" type="BINDATA" />
426 <include name="IDR_GCM_INTERNALS_CSS" file="resources\gcm_internals.css" t ype="BINDATA" /> 426 <include name="IDR_GCM_INTERNALS_CSS" file="resources\gcm_internals.css" t ype="BINDATA" />
427 <include name="IDR_GCM_INTERNALS_JS" file="resources\gcm_internals.js" typ e="BINDATA" /> 427 <include name="IDR_GCM_INTERNALS_JS" file="resources\gcm_internals.js" typ e="BINDATA" />
428 </includes> 428 </includes>
429 </release> 429 </release>
430 </grit> 430 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | chrome/browser/prefs/browser_prefs.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698