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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/panels/panel.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
« no previous file with comments | « chrome/browser/ui/gtk/script_bubble_gtk.cc ('k') | chrome/browser/ui/views/action_box_menu.cc » ('j') | chrome/common/extensions/api/extension_action/script_badge_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/panel.cc
diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc
index 89e587ebc5f8890eae1274eef628b0718ef6fde5..00a26b6897ba3ecc83a587b9453873449e6e2853 100644
--- a/chrome/browser/ui/panels/panel.cc
+++ b/chrome/browser/ui/panels/panel.cc
@@ -29,6 +29,7 @@
#include "chrome/browser/ui/panels/stacked_panel_collection.h"
#include "chrome/browser/web_applications/web_app.h"
#include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
#include "chrome/common/extensions/extension.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_source.h"
@@ -856,8 +857,10 @@ void Panel::UpdateAppIcon() {
extensions::ImageLoader* loader = extensions::ImageLoader::Get(profile());
loader->LoadImageAsync(
extension,
- extension->GetIconResource(extension_misc::EXTENSION_ICON_SMALL,
- ExtensionIconSet::MATCH_BIGGER),
+ extensions::IconsInfo::GetIconResource(
+ extension,
+ extension_misc::EXTENSION_ICON_SMALL,
+ ExtensionIconSet::MATCH_BIGGER),
gfx::Size(extension_misc::EXTENSION_ICON_SMALL,
extension_misc::EXTENSION_ICON_SMALL),
base::Bind(&Panel::OnImageLoaded,
« no previous file with comments | « chrome/browser/ui/gtk/script_bubble_gtk.cc ('k') | chrome/browser/ui/views/action_box_menu.cc » ('j') | chrome/common/extensions/api/extension_action/script_badge_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698