chrome/browser/ui/webui/settings/md_settings_ui.cc - Issue 1758013002: WebUI: Allow rejecting a promise that is returned from cr.sendWithPromise().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/settings/md_settings_ui.cc

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, 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

« chrome/browser/ui/webui/settings/appearance_handler.cc ('K') | « chrome/browser/ui/webui/settings/md_settings_ui.h ('k') | chrome/browser/ui/webui/settings/search_engines_handler.cc » ('j') | ui/webui/resources/js/promise_resolver.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/settings/md_settings_ui.cc

diff --git a/chrome/browser/ui/webui/settings/md_settings_ui.cc b/chrome/browser/ui/webui/settings/md_settings_ui.cc

index edc6ef05f60be20be124ffe767cc3fb814853f96..ff904c5344ef00e65ea6c9d22f55dde25da87cb1 100644

--- a/chrome/browser/ui/webui/settings/md_settings_ui.cc

+++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc

@@ -45,9 +45,13 @@ SettingsPageUIHandler::~SettingsPageUIHandler() {

}

void SettingsPageUIHandler::CallJavascriptCallback(

Dan Beam 2016/03/03 19:04:51 maybe we could just introduce 2 methods, ResolveCa

dpapad 2016/03/03 19:51:53 Done.

- const base::Value& callback_id, const base::Value& response) {

+ const base::Value& callback_id,

+ bool is_success,

+ const base::Value& response) {

// cr.webUIResponse is a global JS function exposed from cr.js.

- web_ui()->CallJavascriptFunction("cr.webUIResponse", callback_id, response);

+ web_ui()->CallJavascriptFunction(

+ "cr.webUIResponse", callback_id,

+ base::FundamentalValue(is_success), response);

}

MdSettingsUI::MdSettingsUI(content::WebUI* web_ui)