mac: Switch browser action backgrounds from vectors to bitmaps

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 18 matching lines @@
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 #include "ui/gfx/size.h"
 
 using extensions::Extension;
 
 NSString* const kBrowserActionButtonDraggingNotification =
     @"BrowserActionButtonDraggingNotification";
 NSString* const kBrowserActionButtonDragEndNotification =
     @"BrowserActionButtonDragEndNotification";
 
-static const CGFloat kBrowserActionBadgeOriginYOffset = 5;
-
-namespace {
+const CGFloat kBrowserActionBadgeOriginYOffset = 5;
 const CGFloat kAnimationDuration = 0.2;
-}  // anonymous namespace
 
 // A helper class to bridge the asynchronous Skia bitmap loading mechanism to
 // the extension's button.
 class ExtensionImageTrackerBridge : public content::NotificationObserver,
                                     public ImageLoadingTracker::Observer {
  public:
   ExtensionImageTrackerBridge(BrowserActionButton* owner,
                               const Extension* extension)
       : owner_(owner),
         tracker_(this),
@@ skipping 76 matching lines @@
     // 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];
     [cell setTabId:tabId];
     [cell setExtensionAction:extension->browser_action()];
     [cell
         accessibilitySetOverrideValue:base::SysUTF8ToNSString(extension->name())
         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];
 
     [self setTitle:@""];
     [self setButtonType:NSMomentaryChangeButton];
     [self setShowsBorderOnlyWhileMouseInside:YES];
 
     [self setMenu:[[[ExtensionActionContextMenu alloc]
         initWithExtension:extension
                   browser:browser
           extensionAction:extension->browser_action()] autorelease]];
 
@@ skipping 57 matching lines @@
       [self endDrag];
     } else {
       [super mouseUp:theEvent];
     }
   }
 }
 
 - (void)endDrag {
   isBeingDragged_ = NO;
   [[NSNotificationCenter defaultCenter]
-      postNotificationName:kBrowserActionButtonDragEndNotification
-                    object:self];
+      postNotificationName:kBrowserActionButtonDragEndNotification object:self];
   [[self cell] setHighlighted:NO];
 }
 
 - (void)setFrame:(NSRect)frameRect animate:(BOOL)animate {
   if (!animate) {
     [self setFrame:frameRect];
   } else {
     if ([moveAnimation_ isAnimating])
       [moveAnimation_ stopAnimation];
 
@@ skipping 70 matching lines @@
 @synthesize tabId = tabId_;
 @synthesize extensionAction = extensionAction_;
 
 - (void)drawBadgeWithinFrame:(NSRect)frame {
   gfx::CanvasSkiaPaint canvas(frame, false);
   canvas.set_composite_alpha(true);
   gfx::Rect boundingRect(NSRectToCGRect(frame));
   extensionAction_->PaintBadge(&canvas, boundingRect, tabId_);
 }
 
-- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
+- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   gfx::ScopedNSGraphicsContextSaveGState scopedGState;
-  [super drawInteriorWithFrame:cellFrame inView:controlView];
+  [super drawWithFrame:cellFrame inView:controlView];
+  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
+            neverFlipped:YES];
+
   cellFrame.origin.y += kBrowserActionBadgeOriginYOffset;
   [self drawBadgeWithinFrame:cellFrame];
 }
 
 @end