content/browser/web_contents/web_contents_impl.cc - Issue 128053002: Make WebContentsDelegate::OpenColorChooser return NULL on failure

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: content/browser/web_contents/web_contents_impl.cc

Issue 128053002: Make WebContentsDelegate::OpenColorChooser return NULL on failure (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 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: content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc

index 3dfd6ed3b55a4304067bb6beec1b17f52049550b..014384612c6203e8173dd7ae4c4a46164571ad66 100644

--- a/content/browser/web_contents/web_contents_impl.cc

+++ b/content/browser/web_contents/web_contents_impl.cc

@@ -2457,8 +2457,10 @@ void WebContentsImpl::OnOpenColorChooser(

const std::vector<ColorSuggestion>& suggestions) {

ColorChooser* new_color_chooser =

delegate_->OpenColorChooser(this, color, suggestions);

- if (color_chooser_ == new_color_chooser)

+ if (!new_color_chooser)

return;

+ if (color_chooser_)

+ color_chooser_->End();

color_chooser_.reset(new_color_chooser);

color_chooser_identifier_ = color_chooser_id;

}