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

Unified Diff: chrome/browser/ui/ash/app_icon_loader_impl.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, 11 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_icon_loader_impl.cc
diff --git a/chrome/browser/ui/ash/app_icon_loader_impl.cc b/chrome/browser/ui/ash/app_icon_loader_impl.cc
index 9c7b6735277ee53bf9dc54b37109c31e32369ba4..8a6765c24a4cd790f1c46699a7282cda617b8440 100644
--- a/chrome/browser/ui/ash/app_icon_loader_impl.cc
+++ b/chrome/browser/ui/ash/app_icon_loader_impl.cc
@@ -8,6 +8,7 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
#include "ui/gfx/color_utils.h"
@@ -55,9 +56,9 @@ void AppIconLoaderImpl::FetchImage(const std::string& id) {
extensions::IconImage* image = new extensions::IconImage(
extension,
- extension->icons(),
+ extensions::IconsInfo::GetIcons(extension),
icon_size_,
- extensions::Extension::GetDefaultIcon(true),
+ extensions::IconsInfo::GetDefaultAppIcon(),
this);
// |map_| takes ownership of |image|.
map_[image] = id;

Powered by Google App Engine
This is Rietveld 408576698