chrome/browser/ui/webui/constrained_html_ui.cc - Issue 7757006: Allow no arguments in ConstrainedHtmlUI::OnDialogClose()

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/constrained_html_ui.cc

Issue 7757006: Allow no arguments in ConstrainedHtmlUI::OnDialogClose() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Handle no arguments in ConstrainedHtmlUI::OnDialogCloseMessage(). Created 9 years, 3 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:

Index: chrome/browser/ui/webui/constrained_html_ui.cc

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

index caf05bc39214c3c208300529f69441d3ca218aac..220fdfe5250374426815de456c6d9992b784a18d 100644

--- a/chrome/browser/ui/webui/constrained_html_ui.cc

+++ b/chrome/browser/ui/webui/constrained_html_ui.cc

@@ -49,7 +49,7 @@ void ConstrainedHtmlUI::OnDialogCloseMessage(const ListValue* args) {

return;

std::string json_retval;

- if (!args->GetString(0, &json_retval))

+ if (!args->empty() && !args->GetString(0, &json_retval))

NOTREACHED() << "Could not read JSON argument";

delegate->GetHtmlDialogUIDelegate()->OnDialogClosed(json_retval);

delegate->OnDialogCloseFromWebUI();

« no previous file with comments | « no previous file | no next file » | no next file with comments »