chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc - Issue 2900783003: Handle app custom icon via aura::Window property.

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/ash/launcher/extension_app_window_launcher_item_controller.cc

Issue 2900783003: Handle app custom icon via aura::Window property. (Closed)

Patch Set: fix mac compile Created 3 years, 7 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

« no previous file with comments | « chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc ('k') | chrome/browser/ui/test/test_app_window_icon_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc

diff --git a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc

index 04bc180a64b35d401bce6d37d7b3198827cb9de5..78c557b092b425bee0c4d86ea220f4ea3f8708b5 100644

--- a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc

+++ b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc

@@ -58,8 +58,15 @@ ash::MenuItemList ExtensionAppWindowLauncherItemController::GetAppMenuItems(

favicon::ContentFaviconDriver::FromWebContents(

app_window->web_contents());

gfx::Image icon = favicon_driver->GetFavicon();

- if (icon.IsEmpty())

- icon = app_window->app_icon();

+ if (icon.IsEmpty()) {

+ const gfx::ImageSkia* app_icon = nullptr;

+ if (app_window->GetNativeWindow()) {

+ app_icon = app_window->GetNativeWindow()->GetProperty(

+ aura::client::kAppIconKey);

+ }

+ if (app_icon && !app_icon->isNull())

+ icon = gfx::Image(*app_icon);

+ }

if (!icon.IsEmpty())

item->image = *icon.ToSkBitmap();

items.push_back(std::move(item));