[Extensions UI] Clean up extension icon generation

chrome/browser/ui/cocoa/extensions/browser_action_button.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
@@ skipping 17 matching lines @@
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 NSString* const kBrowserActionButtonDraggingNotification =
     @"BrowserActionButtonDraggingNotification";
 NSString* const kBrowserActionButtonDragEndNotification =
     @"BrowserActionButtonDragEndNotification";
 
-static const CGFloat kBrowserActionBadgeOriginYOffset = 5;
 static const CGFloat kAnimationDuration = 0.2;
 static const CGFloat kMinimumDragDistance = 5;
 
 @interface BrowserActionButton ()
 - (void)endDrag;
 - (void)updateHighlightedState;
 - (MenuController*)contextMenuController;
 - (void)menuDidClose:(NSNotification*)notification;
 @end
 
@@ skipping 115 matching lines @@
   [[owner_ cell] setHighlighted:YES];
   [[owner_ menu] popUpMenuPositioningItem:nil
                                atLocation:menuPoint
                                    inView:owner_];
   [[owner_ cell] setHighlighted:NO];
   contextMenuRunning_ = false;
   // When the menu closed, the ViewController should have popped itself back in.
   DCHECK(![controller_ toolbarActionsBar]->popped_out_action());
 }
 
-@interface BrowserActionCell (Internals)
-- (void)drawBadgeWithinFrame:(NSRect)frame
-              forWebContents:(content::WebContents*)webContents;
-@end
-
 @implementation BrowserActionButton
 
 @synthesize isBeingDragged = isBeingDragged_;
 
 + (Class)cellClass {
   return [BrowserActionCell class];
 }
 
 - (id)initWithFrame:(NSRect)frame
      viewController:(ToolbarActionViewController*)viewController
          controller:(BrowserActionsController*)controller {
   if ((self = [super initWithFrame:frame])) {
     BrowserActionCell* cell = [[[BrowserActionCell alloc] init] autorelease];
     // [NSButton setCell:] warns to NOT use setCell: other than in the
     // initializer of a control.  However, we are using a basic
     // NSButton whose initializer does not take an NSCell as an
     // object.  To honor the assumed semantics, we do nothing with
     // NSButton between alloc/init and setCell:.
     [self setCell:cell];
 
     browserActionsController_ = controller;
     viewController_ = viewController;
     viewControllerDelegate_.reset(
         new ToolbarActionViewDelegateBridge(self, controller, viewController));
 
     [cell setBrowserActionsController:controller];
-    [cell setViewController:viewController_];
     [cell
         accessibilitySetOverrideValue:base::SysUTF16ToNSString(
             viewController_->GetAccessibleName([controller currentWebContents]))
         forAttribute:NSAccessibilityDescriptionAttribute];
     [cell setImageID:IDR_BROWSER_ACTION
       forButtonState:image_button_cell::kDefaultState];
     [cell setImageID:IDR_BROWSER_ACTION_H
       forButtonState:image_button_cell::kHoverState];
     [cell setImageID:IDR_BROWSER_ACTION_P
       forButtonState:image_button_cell::kPressedState];
@@ skipping 184 matching lines @@
     [[self cell] setImageID:IDR_BROWSER_ACTION_R
         forButtonState:image_button_cell::kDefaultState];
   } else {
     [[self cell] setImageID:IDR_BROWSER_ACTION
         forButtonState:image_button_cell::kDefaultState];
   }
 
   base::string16 tooltip = viewController_->GetTooltip(webContents);
   [self setToolTip:(tooltip.empty() ? nil : base::SysUTF16ToNSString(tooltip))];
 
-  gfx::Image image = viewController_->GetIcon(webContents);
+  NSRect frame = [self frame];
+  gfx::Image image =
+      viewController_->GetIcon(webContents,
+                               gfx::Size(NSWidth(frame), NSHeight(frame)));

[Avi (use Gerrit), 2015/07/02 00:33:23]

CGSizeFromNSSize(frame.size) should do it.

[Devlin, 2015/07/06 19:16:07]

Dang, I was looking for that method, but couldn't remember the magical
combination of terms.  And actually, it looks like CGSizeFromNSSize doesn't
really exist either... but apparently, NSRect.size returns CGSize, so we can
just use that.  Ain't Cocoa fun. ;)

 
   if (!image.IsEmpty())
     [self setImage:image.ToNSImage()];
 
   [self setEnabled:viewController_->IsEnabled(webContents)];
 
   [self setNeedsDisplay:YES];
 }
 
 - (void)onRemoved {
@@ skipping 39 matching lines @@
       NSMakeRect(std::floor((NSWidth(bounds) - imageSize.width) / 2.0),
                  std::floor((NSHeight(bounds) - imageSize.height) / 2.0),
                  imageSize.width, imageSize.height);
   [actionImage drawInRect:imageRect
                  fromRect:NSZeroRect
                 operation:NSCompositeSourceOver
                  fraction:1.0
            respectFlipped:YES
                     hints:nil];
 
-  bounds.origin.y += kBrowserActionBadgeOriginYOffset;
-  [[self cell] drawBadgeWithinFrame:bounds
-                     forWebContents:
-                            [browserActionsController_ currentWebContents]];
-
   [image unlockFocus];
   return image;
 }
 
 - (NSMenu*)menu {
   // Hack: Since Cocoa doesn't support menus-running-in-menus (see also comment
   // in -rightMouseDown:), it doesn't launch the menu for an overflowed action
   // on a Control-click. Even more unfortunate, it doesn't even pass us the
   // mouseDown event for control clicks. However, it does call -menuForEvent:,
   // which in turn calls -menu:, so we can tap in here and show the menu
@@ skipping 36 matching lines @@
 
 - (void)setTestContextMenu:(NSMenu*)testContextMenu {
   testContextMenu_ = testContextMenu;
 }
 
 @end
 
 @implementation BrowserActionCell
 
 @synthesize browserActionsController = browserActionsController_;
-@synthesize viewController = viewController_;
-
-- (void)drawBadgeWithinFrame:(NSRect)frame
-              forWebContents:(content::WebContents*)webContents {
-  gfx::CanvasSkiaPaint canvas(frame, false);
-  canvas.set_composite_alpha(true);
-  gfx::Rect boundingRect(NSRectToCGRect(frame));
-  viewController_->PaintExtra(&canvas, boundingRect, webContents);
-}
 
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   gfx::ScopedNSGraphicsContextSaveGState scopedGState;
   [super drawWithFrame:cellFrame inView:controlView];
-  DCHECK(viewController_);
-  content::WebContents* webContents =
-      [browserActionsController_ currentWebContents];
+
   const NSSize imageSize = self.image.size;
   const NSRect imageRect =
       NSMakeRect(std::floor((NSWidth(cellFrame) - imageSize.width) / 2.0),
                  std::floor((NSHeight(cellFrame) - imageSize.height) / 2.0),
                  imageSize.width, imageSize.height);
   [self.image drawInRect:imageRect
                 fromRect:NSZeroRect
                operation:NSCompositeSourceOver
                 fraction:1.0
           respectFlipped:YES
                    hints:nil];
-
-  cellFrame.origin.y += kBrowserActionBadgeOriginYOffset;
-  [self drawBadgeWithinFrame:cellFrame
-              forWebContents:webContents];
 }
 
 - (ui::ThemeProvider*)themeProviderForWindow:(NSWindow*)window {
   ui::ThemeProvider* themeProvider = [window themeProvider];
   if (!themeProvider)
     themeProvider =
         [[browserActionsController_ browser]->window()->GetNativeWindow()
             themeProvider];
   return themeProvider;
 }
 
 @end