extensions/browser/app_window/app_window.cc - Issue 2804623004: arc: Restore Chrome badging for apps that have peer in Android apps.

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: extensions/browser/app_window/app_window.cc

Issue 2804623004: arc: Restore Chrome badging for apps that have peer in Android apps. (Closed)

Patch Set: update Created 3 years, 8 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: extensions/browser/app_window/app_window.cc

diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc

index 6d52ad22e934d4cd93892d50f5f57a97cc8d0a75..0aeb0a93406bbf2ccfa3fe92dc4632193b0d0028 100644

--- a/extensions/browser/app_window/app_window.cc

+++ b/extensions/browser/app_window/app_window.cc

@@ -595,7 +595,8 @@ void AppWindow::UpdateAppIcon(const gfx::Image& image) {

// Set the showInShelf=true window icon and add the app_icon_image_

// as a badge. If the image is empty, set the default app icon placeholder

// as the base image.

- if (window_icon_url_.is_valid() && !app_icon_image_->image().IsEmpty()) {

+ if (window_icon_url_.is_valid() && app_icon_image_ &&

khmel 2017/04/06 19:08:59 this fixes crash when icon is set but not showInSh

+ !app_icon_image_->image().IsEmpty()) {

gfx::Image base_image =

!image.IsEmpty()

? image