chrome/browser/ui/apps/chrome_app_delegate.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/apps/chrome_app_delegate.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:

Index: chrome/browser/ui/apps/chrome_app_delegate.cc

diff --git a/chrome/browser/ui/apps/chrome_app_delegate.cc b/chrome/browser/ui/apps/chrome_app_delegate.cc

index 2111f5ec8bdc077f6a078865cd45f845634fd65d..619d53c8171236e47601321257f7be68c0156730 100644

--- a/chrome/browser/ui/apps/chrome_app_delegate.cc

+++ b/chrome/browser/ui/apps/chrome_app_delegate.cc

@@ -294,7 +294,7 @@ bool ChromeAppDelegate::CheckMediaAccessPermission(

web_contents, security_origin, type, extension);

}

-int ChromeAppDelegate::PreferredIconSize() {

+int ChromeAppDelegate::PreferredIconSize() const {

#if defined(USE_ASH)

return ash::kShelfSize;

#else