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

Unified Diff: chrome/browser/ui/webui/ntp/app_launcher_handler.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/webui/ntp/app_launcher_handler.cc
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
index 09151273e20cf3a7b39a952321b17813c3737e1a..c90bc0a3d67aa5f31cab2b82fdcc0a58961d41e7 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -37,6 +37,7 @@
#include "chrome/browser/ui/webui/web_ui_util.h"
#include "chrome/common/chrome_notification_types.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/extensions/extension_resource.h"
#include "chrome/common/favicon_url.h"
@@ -129,7 +130,7 @@ void AppLauncherHandler::CreateAppInfo(
// Instead of setting grayscale here, we do it in apps_page.js.
GURL icon_big =
ExtensionIconSource::GetIconURL(extension,
- ExtensionIconSet::EXTENSION_ICON_LARGE,
+ extension_misc::EXTENSION_ICON_LARGE,
ExtensionIconSet::MATCH_BIGGER,
false, &icon_big_exists);
value->SetString("icon_big", icon_big.spec());
@@ -137,7 +138,7 @@ void AppLauncherHandler::CreateAppInfo(
bool icon_small_exists = true;
GURL icon_small =
ExtensionIconSource::GetIconURL(extension,
- ExtensionIconSet::EXTENSION_ICON_BITTY,
+ extension_misc::EXTENSION_ICON_BITTY,
ExtensionIconSet::MATCH_BIGGER,
false, &icon_small_exists);
value->SetString("icon_small", icon_small.spec());
« no previous file with comments | « chrome/browser/ui/webui/extensions/extension_settings_handler.cc ('k') | chrome/common/extensions/extension.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698