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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm

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/ash/launcher/chrome_launcher_controller_per_browser.cc ('k') | chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller.mm » ('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/cocoa/infobars/extension_infobar_controller.mm
diff --git a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
index caed8d1bc2c2aa262b4fa21fd2e26e3ed973d880..bc6cc69e23c6b2e1923b39a8caed17ed72dd30b8 100644
--- a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
+++ b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm
@@ -15,6 +15,7 @@
#import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"
#include "chrome/browser/ui/cocoa/infobars/infobar.h"
#import "chrome/browser/ui/cocoa/menu_button.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_icon_set.h"
@@ -73,8 +74,10 @@ class InfobarBridge : public ExtensionInfoBarDelegate::DelegateObserver {
const extensions::Extension* extension = delegate_->extension_host()->
extension();
ExtensionResource icon_resource =
- extension->GetIconResource(extension_misc::EXTENSION_ICON_BITTY,
- ExtensionIconSet::MATCH_EXACTLY);
+ extensions::IconsInfo::GetIconResource(
+ extension,
+ extension_misc::EXTENSION_ICON_BITTY,
+ ExtensionIconSet::MATCH_EXACTLY);
extensions::ImageLoader* loader =
extensions::ImageLoader::Get(delegate_->extension_host()->profile());
loader->LoadImageAsync(extension, icon_resource,
« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc ('k') | chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller.mm » ('j') | chrome/common/extensions/api/extension_action/script_badge_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698