chrome/browser/extensions/extension_install_prompt.cc - Issue 1530403005: [Extensions] Fix install prompt icon bug

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/extensions/extension_install_prompt.cc

Issue 1530403005: [Extensions] Fix install prompt icon bug (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years 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/extensions/extension_install_prompt.cc

diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc

index 6567b073d17dadaae7118a87efea28a72cad8603..ac73bd583775b7898cf9414bd7663aa10829bb77 100644

--- a/chrome/browser/extensions/extension_install_prompt.cc

+++ b/chrome/browser/extensions/extension_install_prompt.cc

@@ -669,7 +669,8 @@ void ExtensionInstallPrompt::ShowDialog(

DCHECK(prompt);

extension_ = extension;

delegate_ = delegate;

- SetIcon(icon);

+ if (icon && !icon->empty())

+ SetIcon(icon);

Devlin 2015/12/17 22:21:14 D'oh. Forgot that SetIcon() sets the default if |

prompt_ = prompt.Pass();

custom_permissions_ = custom_permissions.Pass();

show_dialog_callback_ = show_dialog_callback;