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

Unified Diff: ui/webui/resources/js/cr/promise_resolver.js

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: 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 side-by-side diff with in-line comments
Download patch
« ui/webui/resources/js/cr.js ('K') | « ui/webui/resources/js/cr.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/webui/resources/js/cr/promise_resolver.js
diff --git a/chrome/test/data/webui/promise_resolver.js b/ui/webui/resources/js/cr/promise_resolver.js
similarity index 54%
rename from chrome/test/data/webui/promise_resolver.js
rename to ui/webui/resources/js/cr/promise_resolver.js
index 0c0e22683e41ac096289a0a98d201bb9296450c5..164fd60c00944c27b68e069c04cb631298d0561a 100644
--- a/chrome/test/data/webui/promise_resolver.js
+++ b/ui/webui/resources/js/cr/promise_resolver.js
@@ -16,19 +16,24 @@
* resolver.resolve({hello: 'world'});
*/
-/**
- * @constructor
- */
-function PromiseResolver() {
- /** @type {!Function} */
- this.resolve;
+cr.define('cr', function() {
Dan Beam 2016/03/02 19:17:40 why does this need to be namespaced to cr.*?
dpapad 2016/03/02 20:02:09 Moved one level up.
+ console.log('promise_resolver.js running');
+ /** @constructor */
+ function PromiseResolver() {
+ /** @type {!Function} */
+ this.resolve;
+
+ /** @type {!Function} */
+ this.reject;
- /** @type {!Function} */
- this.reject;
+ /** @type {!Promise} */
+ this.promise = new Promise(function(resolve, reject) {
+ this.resolve = resolve;
+ this.reject = reject;
+ }.bind(this));
+ }
- /** @type {!Promise} */
- this.promise = new Promise(function(resolve, reject) {
- this.resolve = resolve;
- this.reject = reject;
- }.bind(this));
-}
+ return {
+ PromiseResolver: PromiseResolver
+ };
+});
« ui/webui/resources/js/cr.js ('K') | « ui/webui/resources/js/cr.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698