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

Unified Diff: athena/content/content_app_model_builder.cc

Issue 535373002: Move extension/app default icon into src/extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: icon_image Created 6 years, 3 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
Index: athena/content/content_app_model_builder.cc
diff --git a/athena/content/content_app_model_builder.cc b/athena/content/content_app_model_builder.cc
index 06cb747c856a9a20a1f648e18df0c9f45ce6b4e6..6f9c6bf8bdec7c7b4a577b5ec99261dac6df1cde 100644
--- a/athena/content/content_app_model_builder.cc
+++ b/athena/content/content_app_model_builder.cc
@@ -11,8 +11,10 @@
#include "extensions/common/constants.h"
#include "extensions/common/extension_set.h"
#include "extensions/common/manifest_handlers/icons_handler.h"
+#include "extensions/grit/extensions_browser_resources.h"
#include "ui/app_list/app_list_item.h"
#include "ui/app_list/app_list_model.h"
+#include "ui/base/resource/resource_bundle.h"
namespace athena {
@@ -65,8 +67,8 @@ class AppItem : public app_list::AppListItem {
extension.get(),
extensions::IconsInfo::GetIcons(extension.get()),
extension_misc::EXTENSION_ICON_MEDIUM,
- // TODO(mukai): better default icon
- CreateFlatColorImage(SK_ColorBLACK),
+ *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+ IDR_APP_DEFAULT_ICON),
NULL) {
icon_image_.image_skia().EnsureRepsForSupportedScales();
SetIcon(icon_image_.image_skia(), false);
« no previous file with comments | « athena/content/DEPS ('k') | athena/resources/athena_resources.gyp » ('j') | extensions/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698