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

Unified Diff: chrome/browser/ui/views/create_application_shortcut_view.cc

Issue 11786003: Move Icons out of Extension class (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_browser_action
Patch Set: Created 7 years, 10 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/views/create_application_shortcut_view.cc
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc
index c77e98324f632531f3164eeb6270dba1b2a00525..550f5b3f0ed44079e67581dd7e6a48af841ccdd5 100644
--- a/chrome/browser/ui/views/create_application_shortcut_view.cc
+++ b/chrome/browser/ui/views/create_application_shortcut_view.cc
@@ -22,6 +22,7 @@
#include "chrome/browser/ui/web_applications/web_app_ui.h"
#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
#include "chrome/common/chrome_constants.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_resource.h"
#include "chrome/common/pref_names.h"
@@ -495,14 +496,16 @@ CreateChromeApplicationShortcutView::CreateChromeApplicationShortcutView(
// we will resize whatever we can get. Making a large icon smaller
// is prefered to making a small icon larger, so look for a larger
// icon first:
- ExtensionResource icon_resource = app_->GetIconResource(
+ ExtensionResource icon_resource = extensions::IconsInfo::GetIconResource(
+ app_,
kAppIconSize,
ExtensionIconSet::MATCH_BIGGER);
// If no icon exists that is the desired size or larger, get the
// largest icon available:
if (icon_resource.empty()) {
- icon_resource = app_->GetIconResource(
+ icon_resource = extensions::IconsInfo::GetIconResource(
+ app_,
kAppIconSize,
ExtensionIconSet::MATCH_SMALLER);
}

Powered by Google App Engine
This is Rietveld 408576698