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

Side by Side Diff: ui/webui/resources/webui_resources.grd

Issue 1758013002: WebUI: Allow rejecting a promise that is returned from cr.sendWithPromise(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit Created 4 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
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/webui_resources.h" type="rc_header"> 6 <output filename="grit/webui_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/webui_resources_map.cc" 9 <output filename="grit/webui_resources_map.cc"
10 type="resource_file_map_source" /> 10 type="resource_file_map_source" />
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 file="css/tree.css" type="chrome_html" 253 file="css/tree.css" type="chrome_html"
254 flattenhtml="true" /> 254 flattenhtml="true" />
255 <structure name="IDR_WEBUI_CSS_WIDGETS" 255 <structure name="IDR_WEBUI_CSS_WIDGETS"
256 file="css/widgets.css" type="chrome_html" 256 file="css/widgets.css" type="chrome_html"
257 flattenhtml="true" /> 257 flattenhtml="true" />
258 258
259 <structure name="IDR_WEBUI_HTML_ACTION_LINK" 259 <structure name="IDR_WEBUI_HTML_ACTION_LINK"
260 file="html/action_link.html" type="chrome_html" /> 260 file="html/action_link.html" type="chrome_html" />
261 <structure name="IDR_WEBUI_HTML_ASSERT" 261 <structure name="IDR_WEBUI_HTML_ASSERT"
262 file="html/assert.html" type="chrome_html" /> 262 file="html/assert.html" type="chrome_html" />
263 <structure name="IDR_WEBUI_HTML_PROMISE_RESOLVER"
264 file="html/promise_resolver.html" type="chrome_html" />
263 <structure name="IDR_WEBUI_HTML_CR" 265 <structure name="IDR_WEBUI_HTML_CR"
264 file="html/cr.html" type="chrome_html" /> 266 file="html/cr.html" type="chrome_html" />
265 <structure name="IDR_WEBUI_HTML_CR_EVENT_TARGET" 267 <structure name="IDR_WEBUI_HTML_CR_EVENT_TARGET"
266 file="html/cr/event_target.html" type="chrome_html" /> 268 file="html/cr/event_target.html" type="chrome_html" />
267 <structure name="IDR_WEBUI_HTML_CR_UI" 269 <structure name="IDR_WEBUI_HTML_CR_UI"
268 file="html/cr/ui.html" type="chrome_html" /> 270 file="html/cr/ui.html" type="chrome_html" />
269 <structure name="IDR_WEBUI_HTML_CR_UI_ALERT_OVERLAY" 271 <structure name="IDR_WEBUI_HTML_CR_UI_ALERT_OVERLAY"
270 file="html/cr/ui/alert_overlay.html" type="chrome_html" /> 272 file="html/cr/ui/alert_overlay.html" type="chrome_html" />
271 <structure name="IDR_WEBUI_HTML_CR_UI_COMMAND" 273 <structure name="IDR_WEBUI_HTML_CR_UI_COMMAND"
272 file="html/cr/ui/command.html" type="chrome_html" /> 274 file="html/cr/ui/command.html" type="chrome_html" />
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 file="html/polymer_config.html" type="chrome_html" /> 307 file="html/polymer_config.html" type="chrome_html" />
306 <structure name="IDR_WEBUI_HTML_I18N_BEHAVIOR" 308 <structure name="IDR_WEBUI_HTML_I18N_BEHAVIOR"
307 file="html/i18n_behavior.html" type="chrome_html" /> 309 file="html/i18n_behavior.html" type="chrome_html" />
308 <structure name="IDR_WEBUI_HTML_UTIL" 310 <structure name="IDR_WEBUI_HTML_UTIL"
309 file="html/util.html" type="chrome_html" /> 311 file="html/util.html" type="chrome_html" />
310 312
311 <structure name="IDR_WEBUI_JS_ACTION_LINK" 313 <structure name="IDR_WEBUI_JS_ACTION_LINK"
312 file="js/action_link.js" type="chrome_html" /> 314 file="js/action_link.js" type="chrome_html" />
313 <structure name="IDR_WEBUI_JS_ASSERT" 315 <structure name="IDR_WEBUI_JS_ASSERT"
314 file="js/assert.js" type="chrome_html" /> 316 file="js/assert.js" type="chrome_html" />
317 <structure name="IDR_WEBUI_JS_PROMISE_RESOLVER"
318 file="js/promise_resolver.js" type="chrome_html" />
315 <structure name="IDR_WEBUI_JS_CR" 319 <structure name="IDR_WEBUI_JS_CR"
316 file="js/cr.js" type="chrome_html" /> 320 file="js/cr.js" type="chrome_html" />
317 <structure name="IDR_WEBUI_JS_CR_EVENT_TARGET" 321 <structure name="IDR_WEBUI_JS_CR_EVENT_TARGET"
318 file="js/cr/event_target.js" type="chrome_html" /> 322 file="js/cr/event_target.js" type="chrome_html" />
319 <structure name="IDR_WEBUI_JS_CR_LINK_CONTROLLER" 323 <structure name="IDR_WEBUI_JS_CR_LINK_CONTROLLER"
320 file="js/cr/link_controller.js" type="chrome_html" /> 324 file="js/cr/link_controller.js" type="chrome_html" />
321 <structure name="IDR_WEBUI_JS_CR_UI" 325 <structure name="IDR_WEBUI_JS_CR_UI"
322 file="js/cr/ui.js" type="chrome_html" /> 326 file="js/cr/ui.js" type="chrome_html" />
323 <structure name="IDR_WEBUI_JS_CR_UI_ALERT_OVERLAY" 327 <structure name="IDR_WEBUI_JS_CR_UI_ALERT_OVERLAY"
324 file="js/cr/ui/alert_overlay.js" type="chrome_html" /> 328 file="js/cr/ui/alert_overlay.js" type="chrome_html" />
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 file="js/chromeos/ui_account_tweaks.js" 451 file="js/chromeos/ui_account_tweaks.js"
448 type="chrome_html" /> 452 type="chrome_html" />
449 </if> 453 </if>
450 <part file="cr_elements_resources.grdp" /> 454 <part file="cr_elements_resources.grdp" />
451 <if expr="not is_android"> 455 <if expr="not is_android">
452 <part file="polymer_resources.grdp" /> 456 <part file="polymer_resources.grdp" />
453 </if> 457 </if>
454 </structures> 458 </structures>
455 </release> 459 </release>
456 </grit> 460 </grit>
OLDNEW
« ui/webui/resources/js/promise_resolver.js ('K') | « ui/webui/resources/js/promise_resolver.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698