Fix up close button on mac not centering vertically in the download shelf in fullscreen.

chrome/browser/ui/cocoa/hover_close_button.mm

 // Copyright (c) 2011 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/hover_close_button.h"
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #import "chrome/browser/ui/cocoa/animation_utils.h"
 #include "grit/generated_resources.h"
@@ skipping 117 matching lines @@
   [fadeOutAnimation_ setDelegate:nil];
   [fadeOutAnimation_ release];
   fadeOutAnimation_ = nil;
 }
 
 - (void)animationDidEnd:(NSAnimation*)animation {
   [self animationDidStop:animation];
 }
 
 - (void)drawRect:(NSRect)dirtyRect {
+  // Close boxes align left horizontally, and align center vertically.
+  // http:crbug.com/14739 requires this.
   NSRect imageRect = NSZeroRect;
   imageRect.size = [gHoverMouseOverImage size];
 
+  NSRect destRect = [self bounds];
+  destRect.origin.y = (NSHeight(destRect) / 2) - (NSHeight(imageRect) / 2);

[Nico, 2011/08/08 18:23:06]

Do you want to clamp this to integer coordinates?

+  destRect.size = imageRect.size;
+
   switch(self.hoverState) {
     case kHoverStateMouseOver:
-      [gHoverMouseOverImage drawInRect:imageRect
+      [gHoverMouseOverImage drawInRect:destRect
                               fromRect:imageRect
                              operation:NSCompositeSourceOver
                               fraction:1.0];
       break;
 
     case kHoverStateMouseDown:
-      [gHoverMouseDownImage drawInRect:imageRect
+      [gHoverMouseDownImage drawInRect:destRect
                               fromRect:imageRect
                              operation:NSCompositeSourceOver
                               fraction:1.0];
       break;
 
     default:
     case kHoverStateNone: {
       CGFloat value = 1.0;
       if (fadeOutAnimation_) {
         value = [fadeOutAnimation_ currentValue];
         NSImage* previousImage = nil;
         if (previousState_ == kHoverStateMouseOver) {
           previousImage = gHoverMouseOverImage;
         } else {
           previousImage =  gHoverMouseDownImage;
         }
-        [previousImage drawInRect:imageRect
+        [previousImage drawInRect:destRect
                          fromRect:imageRect
                         operation:NSCompositeSourceOver
                          fraction:1.0 - value];
       }
-      [gHoverNoneImage drawInRect:imageRect
+      [gHoverNoneImage drawInRect:destRect
                          fromRect:imageRect
                         operation:NSCompositeSourceOver
                          fraction:value];
       break;
     }
   }
 }
 
 - (void)setFadeOutValue:(CGFloat)value {
   [self setNeedsDisplay];
@@ skipping 82 matching lines @@
   [shadow setShadowColor:[NSColor colorWithCalibratedWhite:0.15 alpha:alpha]];
   [shadow setShadowOffset:NSMakeSize(0.0, 0.0)];
   [shadow setShadowBlurRadius:2.5];
   [xPath fillWithInnerShadow:shadow];
   NSImage* image = [[[NSImage alloc] initWithSize:bounds.size] autorelease];
   [image addRepresentation:imageRep];
   return image;
 }
 
 @end