chrome/browser/ui/webui/settings/search_engines_handler.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/search_engines_handler.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/md_settings_ui.cc ('K') | « chrome/browser/ui/webui/settings/md_settings_ui.cc ('k') | chrome/browser/ui/webui/settings/site_settings_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/search_engines_handler.cc

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

index 12e39767afbc253074bb8ccfb7aea1b74b487202..f0692a194095afb4582742218926915066cf32f7 100644

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

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

@@ -199,7 +199,7 @@ void SearchEnginesHandler::HandleGetSearchEnginesList(

CHECK_EQ(1U, args->GetSize());

const base::Value* callback_id;

CHECK(args->Get(0, &callback_id));

- CallJavascriptCallback(*callback_id, *GetSearchEnginesList());

+ CallJavascriptCallback(*callback_id, true, *GetSearchEnginesList());

}

void SearchEnginesHandler::HandleSetDefaultSearchEngine(

@@ -279,7 +279,7 @@ void SearchEnginesHandler::HandleValidateSearchEngineInput(

CHECK(args->GetString(1, &field_name));

CHECK(args->GetString(2, &field_value));

CallJavascriptCallback(

- *callback_id,

+ *callback_id, true,

base::FundamentalValue(CheckFieldValidity(field_name, field_value)));

}