Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2824)

Unified Diff: chrome/browser/extensions/chrome_app_icon.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 | « no previous file | chrome/browser/ui/apps/chrome_app_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/chrome_app_icon.cc
diff --git a/chrome/browser/extensions/chrome_app_icon.cc b/chrome/browser/extensions/chrome_app_icon.cc
index 1b526d25dc6a81b0415773351886bc1c61b7805b..6c012f73a38bd630b35e107502a6a5c54138a112 100644
--- a/chrome/browser/extensions/chrome_app_icon.cc
+++ b/chrome/browser/extensions/chrome_app_icon.cc
@@ -90,7 +90,8 @@ const Extension* ChromeAppIcon::GetExtension() {
void ChromeAppIcon::Reload() {
const Extension* extension = GetExtension();
icon_ = base::MakeUnique<IconImage>(
- browser_context_, extension, IconsInfo::GetIcons(extension),
+ browser_context_, extension,
+ extension ? IconsInfo::GetIcons(extension) : ExtensionIconSet(),
resource_size_in_dip_, util::GetDefaultAppIcon(), this);
UpdateIcon();
}
« no previous file with comments | « no previous file | chrome/browser/ui/apps/chrome_app_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698