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

Unified Diff: chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm

Issue 1214243003: [Extensions UI] Clean up extension icon generation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: s/skia/ImageSkia Created 5 years, 5 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/cocoa/location_bar/page_action_decoration.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm
index 062152c93474d72c44921d3b45df2e40cee8af65..a911f4acdb63cb688142bd1392552422ca19d508 100644
--- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm
@@ -93,14 +93,14 @@ void PageActionDecoration::UpdateVisibility(WebContents* contents) {
SetToolTip(viewController_->GetTooltip(contents));
// Set the image.
- gfx::Image icon = viewController_->GetIcon(contents);
+ gfx::Size size(ExtensionAction::kPageActionIconMaxSize,
+ ExtensionAction::kPageActionIconMaxSize);
+ gfx::Image icon = viewController_->GetIcon(contents, size);
if (!icon.IsEmpty()) {
SetImage(icon.ToNSImage());
} else if (!GetImage()) {
- const NSSize default_size = NSMakeSize(
- ExtensionAction::kPageActionIconMaxSize,
- ExtensionAction::kPageActionIconMaxSize);
- SetImage([[[NSImage alloc] initWithSize:default_size] autorelease]);
+ NSSize ns_size = NSSizeFromCGSize(size.ToCGSize());
+ SetImage([[[NSImage alloc] initWithSize:ns_size] autorelease]);
}
}

Powered by Google App Engine
This is Rietveld 408576698