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

Unified Diff: chrome/browser/ui/ash/app_list/extension_app_item.cc

Issue 10843014: Generalize ExtensionIconSet to store icon paths for custom size sets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 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 | « chrome/browser/extensions/tab_helper.cc ('k') | chrome/browser/ui/ash/app_list/search_builder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/app_list/extension_app_item.cc
diff --git a/chrome/browser/ui/ash/app_list/extension_app_item.cc b/chrome/browser/ui/ash/app_list/extension_app_item.cc
index eb933c234ec691aaac2a820a526567d07d20f4b8..ad14bcee10b7123068789c83c0226f183737dbc9 100644
--- a/chrome/browser/ui/ash/app_list/extension_app_item.cc
+++ b/chrome/browser/ui/ash/app_list/extension_app_item.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_icon_set.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
@@ -155,10 +156,10 @@ void ExtensionAppItem::LoadImage(const Extension* extension) {
tracker_.reset(new ImageLoadingTracker(this));
tracker_->LoadImage(extension,
extension->GetIconResource(
- ExtensionIconSet::EXTENSION_ICON_LARGE,
+ extension_misc::EXTENSION_ICON_LARGE,
ExtensionIconSet::MATCH_BIGGER),
- gfx::Size(ExtensionIconSet::EXTENSION_ICON_LARGE,
- ExtensionIconSet::EXTENSION_ICON_LARGE),
+ gfx::Size(extension_misc::EXTENSION_ICON_LARGE,
+ extension_misc::EXTENSION_ICON_LARGE),
ImageLoadingTracker::DONT_CACHE);
}
« no previous file with comments | « chrome/browser/extensions/tab_helper.cc ('k') | chrome/browser/ui/ash/app_list/search_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698