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

Unified Diff: chrome/browser/ui/ash/launcher/launcher_app_icon_loader.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
Index: chrome/browser/ui/ash/launcher/launcher_app_icon_loader.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_app_icon_loader.cc b/chrome/browser/ui/ash/launcher/launcher_app_icon_loader.cc
index 33b51b025f9e186abb5a626911602d44641d2fe8..a7e81426bf85a8982c350619bb843c1a3ddda6dc 100644
--- a/chrome/browser/ui/ash/launcher/launcher_app_icon_loader.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_app_icon_loader.cc
@@ -8,6 +8,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_constants.h"
namespace {
@@ -47,10 +48,10 @@ void LauncherAppIconLoader::FetchImage(const std::string& id) {
map_[image_loader_->next_id()] = id;
image_loader_->LoadImage(
extension,
- extension->GetIconResource(ExtensionIconSet::EXTENSION_ICON_SMALL,
+ extension->GetIconResource(extension_misc::EXTENSION_ICON_SMALL,
ExtensionIconSet::MATCH_BIGGER),
- gfx::Size(ExtensionIconSet::EXTENSION_ICON_SMALL,
- ExtensionIconSet::EXTENSION_ICON_SMALL),
+ gfx::Size(extension_misc::EXTENSION_ICON_SMALL,
+ extension_misc::EXTENSION_ICON_SMALL),
ImageLoadingTracker::CACHE);
}
« no previous file with comments | « chrome/browser/ui/ash/app_list/search_builder.cc ('k') | chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698