chrome/browser/ui/webui/settings/site_settings_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/site_settings_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/search_engines_handler.cc ('k') | chrome/test/data/webui/promise_resolver.js » ('j') | ui/webui/resources/js/promise_resolver.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 1d03e27e947c0199f6ba30e17d7e2aeb89faacea..144f281234ffdb0cfaf82c9f9ccce4d855631d45 100644

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

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

@@ -145,7 +145,7 @@ void SiteSettingsHandler::HandleGetDefaultValueForContentType(

else

enabled = setting != CONTENT_SETTING_BLOCK;

- CallJavascriptCallback(*callback_id, base::FundamentalValue(enabled));

+ CallJavascriptCallback(*callback_id, true, base::FundamentalValue(enabled));

}

} // namespace settings