| Index: apps/app_window.cc
|
| diff --git a/apps/app_window.cc b/apps/app_window.cc
|
| index 4b296ee8ad91919372dbdfb227aeb0b345f6a0a5..c75ef592376807feb85acf8b3d998d477fe79a61 100644
|
| --- a/apps/app_window.cc
|
| +++ b/apps/app_window.cc
|
| @@ -47,9 +47,7 @@
|
| #include "extensions/common/manifest_handlers/icons_handler.h"
|
| #include "extensions/common/permissions/permissions_data.h"
|
| #include "extensions/common/switches.h"
|
| -#include "grit/theme_resources.h"
|
| #include "third_party/skia/include/core/SkRegion.h"
|
| -#include "ui/base/resource/resource_bundle.h"
|
| #include "ui/gfx/screen.h"
|
|
|
| #if !defined(OS_MACOSX)
|
| @@ -815,10 +813,6 @@ void AppWindow::UpdateExtensionAppIcon() {
|
| // Avoid using any previous app icons were being downloaded.
|
| image_loader_ptr_factory_.InvalidateWeakPtrs();
|
|
|
| - const gfx::ImageSkia& default_icon =
|
| - *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
|
| - IDR_APP_DEFAULT_ICON);
|
| -
|
| const extensions::Extension* extension = GetExtension();
|
| if (!extension)
|
| return;
|
| @@ -828,7 +822,7 @@ void AppWindow::UpdateExtensionAppIcon() {
|
| extension,
|
| extensions::IconsInfo::GetIcons(extension),
|
| app_delegate_->PreferredIconSize(),
|
| - default_icon,
|
| + app_delegate_->GetAppDefaultIcon(),
|
| this));
|
|
|
| // Triggers actual image loading with 1x resources. The 2x resource will
|
|
|