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

Unified Diff: apps/app_window.cc

Issue 489453002: Add GetAppDefaultIcon() to AppDelegate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | « apps/app_delegate.h ('k') | 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: 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
« no previous file with comments | « apps/app_delegate.h ('k') | chrome/browser/ui/apps/chrome_app_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698