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

Unified Diff: chrome/browser/ui/ash/app_list/search_builder.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/app_list/search_builder.cc
diff --git a/chrome/browser/ui/ash/app_list/search_builder.cc b/chrome/browser/ui/ash/app_list/search_builder.cc
index 11b84b848f07012a5db07a19f659740135bfacd4..b2ab03ef3305ce84c3bd659600402289dbb46ad7 100644
--- a/chrome/browser/ui/ash/app_list/search_builder.cc
+++ b/chrome/browser/ui/ash/app_list/search_builder.cc
@@ -21,6 +21,7 @@
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_icon_set.h"
#include "chrome/common/url_constants.h"
#include "content/public/browser/user_metrics.h"
@@ -128,10 +129,10 @@ class SearchBuilderResult : public app_list::SearchResult,
// TODO(xiyuan): Fix this for HD.
tracker_->LoadImage(extension,
extension->GetIconResource(
- ExtensionIconSet::EXTENSION_ICON_SMALL,
+ 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::DONT_CACHE);
}
« no previous file with comments | « chrome/browser/ui/ash/app_list/extension_app_item.cc ('k') | chrome/browser/ui/ash/launcher/launcher_app_icon_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698